diff --git a/srcpkgs/gimp/gimp-devel.template b/srcpkgs/gimp/gimp-devel.template
index d6e5495370f..d7f01f2a870 100644
--- a/srcpkgs/gimp/gimp-devel.template
+++ b/srcpkgs/gimp/gimp-devel.template
@@ -1,7 +1,7 @@
 # Template file for 'gimp-devel'.
 #
 noarch=yes
-short_desc="${sourcepkg} development files"
+short_desc="${short_desc} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
diff --git a/srcpkgs/gimp/gimp-python.template b/srcpkgs/gimp/gimp-python.template
index 7c19b7d546e..ed2313f306b 100644
--- a/srcpkgs/gimp/gimp-python.template
+++ b/srcpkgs/gimp/gimp-python.template
@@ -2,10 +2,7 @@
 #
 depends="pygtk"
 pycompile_dirs="usr/lib/gimp/2.0/python"
-short_desc="${sourcepkg} Python bindings"
-long_desc="${long_desc}
-
- This package contains the Python bindings."
+short_desc="${short_desc} -- python bindings"
 
 do_install() {
 	mkdir -p ${DESTDIR}/usr/lib/gimp/2.0/plug-ins
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index a81b1f2297b..c104ff91faf 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,15 +1,16 @@
 # Template build file for 'gimp'.
 pkgname=gimp
-version=2.8.2
-revision=2
+version=2.8.4
+revision=1
 build_style=gnu-configure
-configure_args="--without-aa"
+configure_args="--without-aa --without-gvfs --enable-gimp-console
+ --enable-python --with-gif-compression=lzw --with-libcurl --enable-mp"
 depends="desktop-file-utils hicolor-icon-theme"
 makedepends="pkg-config intltool libpng-devel>=1.5.10 gtk+-devel lcms-devel
-alsa-lib-devel dbus-glib-devel libXmu-devel libXext-devel libXcursor-devel
-libexif-devel libsoup-devel webkit-gtk-devel libwmf-devel librsvg-devel
-libmng-devel libXpm-devel libcurl-devel babl-devel gegl-devel pygtk-devel
-libgudev-devel jasper-devel poppler-glib-devel ghostscript-devel"
+ alsa-lib-devel dbus-glib-devel libXmu-devel libXcursor-devel
+ libexif-devel libsoup-devel webkit-gtk-devel libwmf-devel librsvg-devel
+ libmng-devel libXpm-devel libcurl-devel babl-devel gegl-devel pygtk-devel
+ libgudev-devel jasper-devel poppler-glib-devel ghostscript-devel"
 fulldepends="iso-codes"
 subpackages="gimp-devel gimp-python"
 short_desc="The GNU image manipulation program"
@@ -17,7 +18,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gimp.org"
 license="GPL-3"
 distfiles="ftp://ftp.gimp.org/pub/gimp/v${version%.*}/gimp-$version.tar.bz2"
-checksum=0cd1a7e67e132ead810e16e31ff929394c83fcf841e4a295c45d6f3829601ad9
+checksum=e24a9f826e7c30edb83d96f4cf4787cf1a0ed98f28ea947d19736b4f49787ab5
 long_desc="
  Powerful image manipulation program similar to Adobe Photoshop[tm].
  It supports layers, arbitrary image sizes and working on several images
@@ -25,11 +26,10 @@ long_desc="
  support and more than 8 bits per channel."
 
 conf_files="
-/etc/gimp/2.0/unitrc
-/etc/gimp/2.0/gtkrc
-/etc/gimp/2.0/menurc
-/etc/gimp/2.0/ps-menurc
-/etc/gimp/2.0/sessionrc
-/etc/gimp/2.0/templaterc
-/etc/gimp/2.0/gimprc
-/etc/gimp/2.0/controllerrc"
+ /etc/gimp/2.0/gimprc
+ /etc/gimp/2.0/gtkrc
+ /etc/gimp/2.0/templaterc
+ /etc/gimp/2.0/unitrc
+ /etc/gimp/2.0/sessionrc
+ /etc/gimp/2.0/controllerrc
+ /etc/gimp/2.0/menurc"