diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile
index 211ce68fe2f3..2dd1d53b2cf3 100644
--- a/graphics/gimpshop/Makefile
+++ b/graphics/gimpshop/Makefile
@@ -6,24 +6,21 @@
 #
 
 PORTNAME=	gimpshop
-PORTVERSION=	2.2.10
-PORTREVISION=	2
+PORTVERSION=	2.2.11
 CATEGORIES=	graphics gnome
 MASTER_SITES=	http://www.plasticbugs.com/blogimg/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	marcus
-DISTNAME=	${PORTNAME}-source-${PORTVERSION}
+		http://freebsd.powered.net/distfiles/
 
 MAINTAINER=	rainer.alves@gmail.com
 COMMENT=	GIMP fork resembling Adobe Photoshop
 
-LIB_DEPENDS=	wmf.2:${PORTSDIR}/graphics/libwmf \
-		aa.1:${PORTSDIR}/graphics/aalib \
-		exif.12:${PORTSDIR}/graphics/libexif \
-		mng.1:${PORTSDIR}/graphics/libmng \
-		png.5:${PORTSDIR}/graphics/png \
-		jpeg.9:${PORTSDIR}/graphics/jpeg \
-		tiff.4:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=	wmf:${PORTSDIR}/graphics/libwmf \
+		aa:${PORTSDIR}/graphics/aalib \
+		exif:${PORTSDIR}/graphics/libexif \
+		mng:${PORTSDIR}/graphics/libmng \
+		png:${PORTSDIR}/graphics/png \
+		jpeg:${PORTSDIR}/graphics/jpeg \
+		tiff:${PORTSDIR}/graphics/tiff
 
 CONFLICTS=	gimp-1.* gimp-2.* gimp-gnome-2.*
 
@@ -34,11 +31,10 @@ USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack intltool intlhack gtk20 libartlgpl2 librsvg2
 WANT_GNOME=	yes
 INSTALLS_SHLIB=	yes
-LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 PLIST_SUB=	SHLIBVER="${SHLIBVER}"
 CONFIGURE_ARGS=	--disable-perl \
 		--with-html-dir=${DOCSDIR} \
@@ -93,7 +89,6 @@ CONFIGURE_ARGS+=	--enable-mp
 USE_GNOME+=		gnomepanel desktopfileutils
 CONFIGURE_ARGS+=	--with-desktop-dir=${X11BASE}/share/gnome
 CONFIGURE_ENV+=		GIMP_THREAD_LIBS=${PTHREAD_LIBS}
-# PKGNAMESUFFIX:=	-gnome
 PLIST_SUB+=		GNOMEPANEL:=""
 GNOME_ENABLED=		yes
 .else
diff --git a/graphics/gimpshop/distinfo b/graphics/gimpshop/distinfo
index 30dd63222c0b..82d15aaedada 100644
--- a/graphics/gimpshop/distinfo
+++ b/graphics/gimpshop/distinfo
@@ -1,3 +1,3 @@
-MD5 (gimpshop-source-2.2.10.tar.bz2) = ab1bf22e3e270d95d10589c6f4c1d78e
-SHA256 (gimpshop-source-2.2.10.tar.bz2) = 9980c7e1be22a55b83b69c335b1c7f0d214b2c73a440cc1e5cf2db309276a6ef
-SIZE (gimpshop-source-2.2.10.tar.bz2) = 16841532
+MD5 (gimpshop-2.2.11.tar.bz2) = 78e25b31b1dab1469cc24ba2a8e30954
+SHA256 (gimpshop-2.2.11.tar.bz2) = 849f20edbf7930a10bd59072ede79312cd1dfe974727277afa097be91febb1b0
+SIZE (gimpshop-2.2.11.tar.bz2) = 13171046
diff --git a/graphics/gimpshop/pkg-plist b/graphics/gimpshop/pkg-plist
index 1051fde38859..be3ca2cabacf 100644
--- a/graphics/gimpshop/pkg-plist
+++ b/graphics/gimpshop/pkg-plist
@@ -1921,12 +1921,12 @@ share/locale/zh_TW/LC_MESSAGES/gimp20.mo
 @dirrm %%DOCSDIR%%/libgimpbase
 @dirrm %%DOCSDIR%%/libgimp
 @dirrm %%DOCSDIR%%
-@dirrm libexec/gimp/2.2/plug-ins
-%%PYTHON:%%@dirrm libexec/gimp/2.2/python
-@dirrm libexec/gimp/2.2/modules
-@dirrm libexec/gimp/2.2/environ
-@dirrm libexec/gimp/2.2
-@dirrm libexec/gimp
+@dirrmtry libexec/gimp/2.2/plug-ins
+%%PYTHON:%%@dirrmtry libexec/gimp/2.2/python
+@dirrmtry libexec/gimp/2.2/modules
+@dirrmtry libexec/gimp/2.2/environ
+@dirrmtry libexec/gimp/2.2
+@dirrmtry libexec/gimp
 @dirrm include/gimp-2.0/libgimpwidgets
 @dirrm include/gimp-2.0/libgimpthumb
 @dirrm include/gimp-2.0/libgimpmodule
@@ -1935,6 +1935,6 @@ share/locale/zh_TW/LC_MESSAGES/gimp20.mo
 @dirrm include/gimp-2.0/libgimpbase
 @dirrm include/gimp-2.0/libgimp
 @dirrm include/gimp-2.0
-@dirrm etc/gimp/2.2
-@dirrm etc/gimp
+@dirrmtry etc/gimp/2.2
+@dirrmtry etc/gimp
 %%GNOMEPANEL:%%@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true