diff --git a/editors/gmanedit/Makefile b/editors/gmanedit/Makefile
index 5db734dde6e4..968481ccb3da 100644
--- a/editors/gmanedit/Makefile
+++ b/editors/gmanedit/Makefile
@@ -6,34 +6,22 @@
 #
 
 PORTNAME=	gmanedit
-PORTVERSION=	0.3.1
-PORTREVISION=	4
+PORTVERSION=	0.4
 CATEGORIES=	editors gnome
-MASTER_SITES=	http://gmanedit.sourceforge.net/files/ \
-		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/gmanedit2
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A GNOME manpages editor
 
-USE_BZIP2=	yes
-USE_X_PREFIX=	yes
+USE_GNOME=	gnomehack gnometarget libgnomeui
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomelibs
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib"
 
-ALL_TARGET=	clean all
-
-post-extract:
-	@${RM} -rf ${WRKSRC}/config.cache
-	@${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${RM} -f
+MAN1=		gmanedit.1
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
-		 s|PACKAGE_PIXMAPS_DIR=".*/pixmaps|PACKAGE_PIXMAPS_DIR="${PREFIX}/share/pixmaps|g' \
-		 	${WRKSRC}/configure
+	@${REINPLACE_CMD} -e '/<argz\.h>/d' ${WRKSRC}/src/callbacks.c
 
 .include <bsd.port.mk>
diff --git a/editors/gmanedit/distinfo b/editors/gmanedit/distinfo
index 8551e7d105ea..0c20356c3228 100644
--- a/editors/gmanedit/distinfo
+++ b/editors/gmanedit/distinfo
@@ -1,3 +1,3 @@
-MD5 (gmanedit-0.3.1.tar.bz2) = 4d942401d61e8461ec739ddbaeab90d6
-SHA256 (gmanedit-0.3.1.tar.bz2) = 535317d528529141d9ad97eb55e52fa3e59d70eeb33fd254fd2ff440aa7d1486
-SIZE (gmanedit-0.3.1.tar.bz2) = 535988
+MD5 (gmanedit-0.4.tar.gz) = ac91b043a7ef0857e517c09a5147f84a
+SHA256 (gmanedit-0.4.tar.gz) = fbfd7c08083e6a1653f075d4b956cb10d74b952ad4e0a6a75cd0ca87dcd52218
+SIZE (gmanedit-0.4.tar.gz) = 213751
diff --git a/editors/gmanedit/pkg-descr b/editors/gmanedit/pkg-descr
index 43a68738e310..49deb2606acb 100644
--- a/editors/gmanedit/pkg-descr
+++ b/editors/gmanedit/pkg-descr
@@ -4,4 +4,4 @@ It's an editor for man pages that runs on X with GTK. It's like most common
 HTML editors but more easy. You need to know manpages format. You can learn it
 from 'man(7)'. 
 
-WWW: http://gmanedit.sourceforge.net/
+WWW: http://sourceforge.net/projects/gmanedit2/
diff --git a/editors/gmanedit/pkg-plist b/editors/gmanedit/pkg-plist
index 1b81f32ab519..0a3ac5003ae3 100644
--- a/editors/gmanedit/pkg-plist
+++ b/editors/gmanedit/pkg-plist
@@ -1,15 +1,9 @@
 bin/gmanedit
+share/applications/gmanedit.desktop
+share/locale/ca/LC_MESSAGES/gmanedit.mo
 share/locale/es/LC_MESSAGES/gmanedit.mo
 share/locale/gl/LC_MESSAGES/gmanedit.mo
 share/locale/ja/LC_MESSAGES/gmanedit.mo
-share/locale/ko/LC_MESSAGES/gmanedit.mo
-share/pixmaps/gmanedit/arrow.xpm
-share/pixmaps/gmanedit/button.xpm
-share/pixmaps/gmanedit/exit.xpm
-share/pixmaps/gmanedit/gmanedit.png
-share/pixmaps/gmanedit/new.xpm
-share/pixmaps/gmanedit/no.xpm
-share/pixmaps/gmanedit/open.xpm
-share/pixmaps/gmanedit/save.xpm
-share/pixmaps/gmanedit/spinbutton.xpm
-@dirrm share/pixmaps/gmanedit
+share/pixmaps/gmanedit.png
+share/pixmaps/gmanedit_icon.png
+@dirrmtry share/applications