diff --git a/sysutils/gtk-imonc/Makefile b/sysutils/gtk-imonc/Makefile
index 93fb5d1507a9..25b1d20be9af 100644
--- a/sysutils/gtk-imonc/Makefile
+++ b/sysutils/gtk-imonc/Makefile
@@ -3,23 +3,42 @@
 
 PORTNAME=	gtk-imonc
 PORTVERSION=	0.6.4.1
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	sysutils
-MASTER_SITES=	http://userpage.fu-berlin.de/~zeank/gtk-imonc/download/
+MASTER_SITES=	http://stefan-strigler.de/download/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A GTK2-based imond-client to control an on(e) disc fli4l router
+COMMENT=	GTK2-based imond-client to control an on(e) disc fli4l router
 
-DEPRECATED=	No more public distfiles
-EXPIRATION_DATE=	2012-11-26
+LICENSE=	GPLv2 # (or later)
+
+LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
+		pcre:${PORTSDIR}/devel/pcre \
+		cairo:${PORTSDIR}/graphics/cairo \
+		png15:${PORTSDIR}/graphics/png \
+		freetype:${PORTSDIR}/print/freetype2 \
+		expat:${PORTSDIR}/textproc/expat2 \
+		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
+		xcb:${PORTSDIR}/x11/libxcb
 
 GNU_CONFIGURE=	yes
+USE_GETTEXT=	yes
+USE_ICONV=	yes
+USE_PKGCONFIG=	build
+USE_GNOME=	gdkpixbuf2 gtk20
+USE_XORG=	pixman x11 xau xcomposite xcursor xdamage xdmcp xext \
+		xfixes xi xinerama xrandr xrender
+MAKE_JOBS_SAFE=	yes
+
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-USE_GNOME=	gtk20 gnomehier
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|<endian.h>|<sys/endian.h>|' \
-		${WRKSRC}/src/md5.h
+	@${REINPLACE_CMD} -e \
+		's|/gnome/apps/Internet|/applications|' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e \
+		's|/usr/share/pixmaps/||' ${WRKSRC}/gtk-imonc.desktop
+	@${REINPLACE_CMD} -e \
+		's|<endian.h>|<sys/endian.h>|' ${WRKSRC}/src/md5.h
 
 .include <bsd.port.mk>
diff --git a/sysutils/gtk-imonc/pkg-descr b/sysutils/gtk-imonc/pkg-descr
index 4264cc899fee..cee29d0166be 100644
--- a/sysutils/gtk-imonc/pkg-descr
+++ b/sysutils/gtk-imonc/pkg-descr
@@ -2,4 +2,4 @@ GTK-Imonc is a GTK2-based imond-client to control an on(e) disc fli4l
 router. You can dial/hangup the connection, show status information
 (traffic, cpu), shutdown/reboot and even remotely update the router.
 
-WWW: http://userpage.fu-berlin.de/%7Ezeank/gtk-imonc/
+WWW: http://stefan-strigler.de/gtkimonc/
diff --git a/sysutils/gtk-imonc/pkg-plist b/sysutils/gtk-imonc/pkg-plist
index 844509e1a2cc..0b4f009fafd1 100644
--- a/sysutils/gtk-imonc/pkg-plist
+++ b/sysutils/gtk-imonc/pkg-plist
@@ -1,16 +1,17 @@
 bin/gtk-imonc
-share/gnome/apps/Internet/gtk-imonc.desktop
-share/gtk-imonc/pixmaps/docklet-inactive.png
-share/gtk-imonc/pixmaps/docklet-offline.png
-share/gtk-imonc/pixmaps/docklet-online.png
-share/gtk-imonc/pixmaps/gtk-imonc.png
-share/gtk-imonc/pixmaps/offline.png
-share/gtk-imonc/pixmaps/offline.xpm
-share/gtk-imonc/pixmaps/online.png
-share/gtk-imonc/pixmaps/online.xpm
-share/gtk-imonc/pixmaps/reboot.png
-share/gtk-imonc/pixmaps/shutdown.png
+share/applications/gtk-imonc.desktop
+%%DATADIR%%/pixmaps/docklet-inactive.png
+%%DATADIR%%/pixmaps/docklet-offline.png
+%%DATADIR%%/pixmaps/docklet-online.png
+%%DATADIR%%/pixmaps/gtk-imonc.png
+%%DATADIR%%/pixmaps/offline.png
+%%DATADIR%%/pixmaps/offline.xpm
+%%DATADIR%%/pixmaps/online.png
+%%DATADIR%%/pixmaps/online.xpm
+%%DATADIR%%/pixmaps/reboot.png
+%%DATADIR%%/pixmaps/shutdown.png
 share/locale/de/LC_MESSAGES/gtk-imonc.mo
 share/pixmaps/gtk-imonc.png
-@dirrm share/gtk-imonc/pixmaps
-@dirrm share/gtk-imonc
+@dirrm %%DATADIR%%/pixmaps
+@dirrm %%DATADIR%%
+@dirrmtry share/applications