diff --git a/srcpkgs/emacs/patches/emacs-24.3-giflib5.patch b/srcpkgs/emacs/patches/emacs-24.3-giflib5.patch
deleted file mode 100644
index f58c319070..0000000000
--- a/srcpkgs/emacs/patches/emacs-24.3-giflib5.patch
+++ /dev/null
@@ -1,97 +0,0 @@
---- src/image.c
-+++ src/image.c	2013-05-21 15:49:41.945819346 +0000
-@@ -7192,7 +7192,11 @@ gif_load (struct frame *f, struct image
- 	}
- 
-       /* Open the GIF file.  */
-+#if GIFLIB_MAJOR < 5
-       gif = fn_DGifOpenFileName (SSDATA (file));
-+#else
-+      gif = fn_DGifOpenFileName (SSDATA (file), NULL);
-+#endif
-       if (gif == NULL)
- 	{
- 	  image_error ("Cannot open `%s'", file, Qnil);
-@@ -7213,7 +7217,11 @@ gif_load (struct frame *f, struct image
-       memsrc.len = SBYTES (specified_data);
-       memsrc.index = 0;
- 
-+#if GIFLIB_MAJOR < 5
-       gif = fn_DGifOpen (&memsrc, gif_read_from_memory);
-+#else
-+      gif = fn_DGifOpen (&memsrc, gif_read_from_memory, NULL);
-+#endif
-       if (!gif)
- 	{
- 	  image_error ("Cannot open memory source `%s'", img->spec, Qnil);
-@@ -7225,7 +7225,11 @@
-   if (!check_image_size (f, gif->SWidth, gif->SHeight))
-     {
-       image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
-+#if GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
-+      fn_DGifCloseFile (gif, NULL);
-+#else
-       fn_DGifCloseFile (gif);
-+#endif
-       return 0;
-     }
- 
-@@ -7234,7 +7238,11 @@
-   if (rc == GIF_ERROR || gif->ImageCount <= 0)
-     {
-       image_error ("Error reading `%s'", img->spec, Qnil);
-+#if GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
-+      fn_DGifCloseFile (gif, NULL);
-+#else
-       fn_DGifCloseFile (gif);
-+#endif
-       return 0;
-     }
- 
-@@ -7246,7 +7254,11 @@
-       {
- 	image_error ("Invalid image number `%s' in image `%s'",
- 		     image_number, img->spec);
-+#if GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
-+	fn_DGifCloseFile (gif, NULL);
-+#else
- 	fn_DGifCloseFile (gif);
-+#endif
- 	return 0;
-       }
-   }
-@@ -7264,14 +7276,22 @@
-   if (!check_image_size (f, width, height))
-     {
-       image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
-+#if GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
-+      fn_DGifCloseFile (gif, NULL);
-+#else
-       fn_DGifCloseFile (gif);
-+#endif
-       return 0;
-     }
- 
-   /* Create the X image and pixmap.  */
-   if (!x_create_x_image_and_pixmap (f, width, height, 0, &ximg, &img->pixmap))
-     {
-+#if GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
-+      fn_DGifCloseFile (gif, NULL);
-+#else
-       fn_DGifCloseFile (gif);
-+#endif
-       return 0;
-     }
- 
-@@ -7447,7 +7467,11 @@
- 			    Fcons (make_number (gif->ImageCount),
- 				   img->lisp_data));
- 
-+#if GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
-+  fn_DGifCloseFile (gif, NULL);
-+#else
-   fn_DGifCloseFile (gif);
-+#endif
- 
-   /* Maybe fill in the background field while we have ximg handy. */
-   if (NILP (image_spec_value (img->spec, QCbackground, NULL)))
diff --git a/srcpkgs/emacs/template b/srcpkgs/emacs/template
index 6893aa2b69..5cd9382e6f 100644
--- a/srcpkgs/emacs/template
+++ b/srcpkgs/emacs/template
@@ -1,7 +1,7 @@
 # Template file for 'emacs'
 pkgname=emacs
-version=24.3
-revision=9
+version=24.4
+revision=1
 nocross=yes
 hostmakedepends="pkg-config"
 makedepends="ncurses-devel libXaw-devel gtk+-devel $(vopt_if dbus dbus-devel)
@@ -9,20 +9,20 @@ $(vopt_if jpeg libjpeg-turbo-devel) $(vopt_if tiff tiff-devel)
 $(vopt_if gif giflib-devel) $(vopt_if png libpng-devel) $(vopt_if xpm libXpm-devel)
 $(vopt_if svg librsvg-devel) $(vopt_if imagemagick libmagick-devel)
 $(vopt_if xml libxml2-devel) $(vopt_if gnutls gnutls-devel)
-$(vopt_if sound alsa-lib-devel)"
+$(vopt_if sound alsa-lib-devel) acl-devel"
 depends="emacs-common-${version}_${revision}"
 replaces="emacs>=0"
 build_style="gnu-configure"
-configure_args="ac_cv_lib_gif_EGifPutExtensionLast=yes
+configure_args="--with-file-notification=inotify
 $(vopt_with dbus) $(vopt_with jpeg) $(vopt_with tiff) $(vopt_with gif)
 $(vopt_with png) $(vopt_with xpm) $(vopt_with svg rsvg) $(vopt_with imagemagick)
 $(vopt_with xml xml2) $(vopt_with gnutls) $(vopt_with sound)"
 short_desc="GNU Emacs editor"
-maintainer="Philipp Hirsch <itself@hanspolo.net>"
+maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
 license="GPL-3"
 homepage="http://www.gnu.org/software/${pkgname}/"
-distfiles="http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=70aa2942e9ae689ed17eddedfca5027c364ffbcc8b59968b1645e935f4c7058d
+distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
+checksum=47e391170db4ca0a3c724530c7050655f6d573a711956b4cd84693c194a9d4fd
 
 # Package build options
 build_options="dbus jpeg tiff gif png xpm svg xml imagemagick gnutls sound"
@@ -36,18 +36,18 @@ pre_configure() {
 	mkdir -p nox
 	mv * nox || true
 	cp -a nox x11
-	cp -a nox gtk2 
+	cp -a nox gtk2
 }
 
 do_configure() {
 	cd $wrksrc/nox
-	./configure --without-x ${configure_args} 
+	./configure --without-x ${configure_args}
 
 	cd $wrksrc/x11
-	./configure --with-x-toolkit=athena --without-toolkit-scroll-bars ${configure_args} 
+	./configure --with-x-toolkit=athena --without-toolkit-scroll-bars ${configure_args}
 
 	cd $wrksrc/gtk2
-	./configure --with-x-toolkit=gtk2 ${configure_args} 
+	./configure --with-x-toolkit=gtk2 ${configure_args}
 }
 
 do_build() {