diff --git a/templates/gimp-devel b/templates/gimp-devel
new file mode 120000
index 00000000000..92344a4bb4a
--- /dev/null
+++ b/templates/gimp-devel
@@ -0,0 +1 @@
+gimp
\ No newline at end of file
diff --git a/templates/gimp/depends b/templates/gimp/depends
new file mode 100644
index 00000000000..274d2cf04be
--- /dev/null
+++ b/templates/gimp/depends
@@ -0,0 +1,2 @@
+abi_depends=2.6.6
+api_depends=${abi_depends}
diff --git a/templates/gimp/devel.template b/templates/gimp/devel.template
new file mode 100644
index 00000000000..86c3ab7acf5
--- /dev/null
+++ b/templates/gimp/devel.template
@@ -0,0 +1,20 @@
+# Template file for 'gimp-devel'.
+#
+short_desc="${sourcepkg} development files"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run gimp
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib
+	mkdir -p ${DESTDIR}/usr/share
+
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/share/gtk-doc ${DESTDIR}/usr/share
+	mv ${SRCPKGDESTDIR}/usr/share/aclocal ${DESTDIR}/usr/share
+}
diff --git a/templates/gimp/template b/templates/gimp/template
index 08b71c8c211..95617fd4551 100644
--- a/templates/gimp/template
+++ b/templates/gimp/template
@@ -1,23 +1,60 @@
 # Template build file for 'gimp'.
 pkgname=gimp
-version=2.6.1
-distfiles="
-http://sunsite.rediris.es/mirror/gimp/v2.6/$pkgname-$version.tar.bz2"
+sourcepkg=$pkgname
+version=2.6.6
+distfiles="http://sunsite.rediris.es/mirror/gimp/v2.6/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
-configure_args="--disable-python"
-make_cmd="$XBPS_MASTERDIR/bin/gmake"
-pkgconfig_override="gimp.pc gimpthumb-2.0.pc gimpui-2.0.pc"
+configure_args="--without-aa --without-webkit --without-gvfs
+ --without-gnomevfs --without-alsa --disable-python --disable-alsatest
+ --enable-gimp-remote"
 short_desc="The GNU image manipulation program"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=4cf18ae63a813ccf35a0b33ede3b24a304b47b03
+checksum=53c261fa5045f4ca4b5e887a1eb394d28ebb08d108f065ef55bde33c892f0751
 long_desc="
  Powerful image manipulation program similar to \"Adobe Photoshop\"[tm].
  It supports layers, arbitrary image sizes and working on several images
  at the same time. It comes with a lot of useful plug-ins. Missing is CMYK
  support and more than 8 bits per channel."
 
-# This needs GNU gettext >= 0.16.
-pre_configure_cmd=". $XBPS_TMPLHELPDIR/external-gettext.sh"
+gtk_iconcache_dirs="/usr/share/icons/hicolor"
+triggers="gtk-icon-cache update-desktopdb mimedb"
+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"
 
-# Update shared-mime-info database.
-postinstall_helpers="update-mimedb.sh"
+subpackages="devel"
+Add_dependency build intltool
+Add_dependency build pkg-config
+Add_dependency build curl
+Add_dependency full glibc
+Add_dependency full gtk+
+Add_dependency full poppler
+Add_dependency full hicolor-icon-theme
+Add_dependency full babl
+Add_dependency full gegl
+Add_dependency full jpeg
+Add_dependency full lcms
+Add_dependency full libmng
+Add_dependency full libart
+Add_dependency full libexif
+Add_dependency full libpng
+Add_dependency full tiff
+Add_dependency full librsvg
+Add_dependency full libwmf
+Add_dependency full libICE
+Add_dependency full libSM
+Add_dependency full libXpm
+Add_dependency full libXmu
+Add_dependency full libXfixes
+Add_dependency full hal
+Add_dependency run  curl-libs
+
+pre_configure()
+{
+	cd / && ${XBPS_TRIGGERSDIR}/gtk-pixbuf-loaders run post-install
+}