diff --git a/srcpkgs/emacs-nox b/srcpkgs/emacs-nox
deleted file mode 120000
index a7642dd168d..00000000000
--- a/srcpkgs/emacs-nox
+++ /dev/null
@@ -1 +0,0 @@
-emacs
\ No newline at end of file
diff --git a/srcpkgs/emacs/template b/srcpkgs/emacs/template
index b729619e52f..2734da6685a 100644
--- a/srcpkgs/emacs/template
+++ b/srcpkgs/emacs/template
@@ -7,47 +7,14 @@ license="GPL-3"
 homepage="http://www.gnu.org/software/${pkgname}/"
 distfiles="http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=0098ca3204813d69cd8412045ba33e8701fa2062f4bff56bedafc064979eef41
-short_desc="GNU Emacs Editor"
-long_desc="GNU Emacs is an extensible, customizable text editor—and more."
+short_desc="GNU Emacs Editor without X support"
 makedepends="libxml2-devel>=2.7.0_1 ncurses-devel>=5.8_1"
 build_style="gnu-configure"
-configure_args=""
+configure_args="--without-x"
 
-do_configure() {
-  mkdir x nox
-
-  cd ${wrksrc}/x
-  ../configure ${configure_args}
-
-  cd ${wrksrc}/nox
-  ../configure ${configure_args} --without-x
-}
-
-do_build() {
-  cd ${wrksrc}/x
-  make ${makejobs}
-
-  cd ${wrksrc}/nox
-  make ${makejobs}
-}
-
-do_install() {
-  cd ${wrksrc}/x
-  make DESTDIR=${DESTDIR}/x install
-
-  cd ${wrksrc}/nox
-  make DESTDIR=${DESTDIR}/nox install
-}
 
 emacs_package() {
   pkg_install() {
-    vmove "x/*"
-  }
-}
-
-emacs-nox_package() {
-  short_desc+=" without X support"
-  pkg_install() {
-    vmove "nox/*"
+    vmove all
   }
 }