diff --git a/emulators/gxmame/Makefile b/emulators/gxmame/Makefile
index c8bdaecdb3c5..7cd15034046e 100644
--- a/emulators/gxmame/Makefile
+++ b/emulators/gxmame/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	gxmame
-PORTVERSION=	0.35
-PORTREVISION=	1
+DISTVERSION=	0.35beta2
+PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-${PORTVERSION}beta1
+DISTNAME=	${PORTNAME}-${DISTVERSION}
 
 MAINTAINER=	flynn@energyhq.es.eu.org
 COMMENT=	GXmame is a GTK frontend for xmame
@@ -19,21 +19,28 @@ COMMENT=	GXmame is a GTK frontend for xmame
 LIB_DEPENDS=	expat.5:${PORTSDIR}/textproc/expat2
 RUN_DEPENDS=	xmame:${PORTSDIR}/emulators/xmame
 
-USE_GETTEXT=	yes
-USE_GZIP=	yes
-USE_ICONV=	yes
-USE_XLIB=	yes
-USE_GNOME=	gtk20
+USE_X_PREFIX=	yes
+USE_GNOME=	gtk20 intlhack gnomehack gnomeprefix
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-#ONLY_FOR_ARCHS=	i386
-
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ENV=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-xmame-dir=${X11BASE}/share/xmame
 
-post-configure:
-	@${REINPLACE_CMD} -e 's|$$(top_builddir)/./mkinstalldirs|./mkinstalldirs|' ${WRKSRC}/intl/Makefile
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.else
+PLIST_SUB+=	NLS=""
+.endif
+
+MAN6=		gxmame.6
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|CFLAGS="-Wall.*||' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|$$(datadir)/doc|${PREFIX}/share/doc|' \
+		${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's|__GNUC___|__GNUC__|' ${WRKSRC}/src/common.h
 
 .include <bsd.port.mk>
diff --git a/emulators/gxmame/distinfo b/emulators/gxmame/distinfo
index 57910515a124..48ff75e5ff96 100644
--- a/emulators/gxmame/distinfo
+++ b/emulators/gxmame/distinfo
@@ -1,2 +1,2 @@
-MD5 (gxmame-0.35beta1.tar.gz) = f5eac2b6e397a9a1996ecaef1c5b8a20
-SIZE (gxmame-0.35beta1.tar.gz) = 760894
+MD5 (gxmame-0.35beta2.tar.gz) = 2ef166272fe2d6b0dfe51dd1616a851c
+SIZE (gxmame-0.35beta2.tar.gz) = 697013
diff --git a/emulators/gxmame/pkg-plist b/emulators/gxmame/pkg-plist
index 4f90e966850c..669ab5589da5 100644
--- a/emulators/gxmame/pkg-plist
+++ b/emulators/gxmame/pkg-plist
@@ -1,36 +1,25 @@
 bin/gxmame
-share/applications/gxmame.desktop
-share/locale/de/LC_MESSAGES/gxmame.mo
-share/locale/el/LC_MESSAGES/gxmame.mo
-share/locale/es/LC_MESSAGES/gxmame.mo
-share/locale/fr/LC_MESSAGES/gxmame.mo
-share/locale/it/LC_MESSAGES/gxmame.mo
-share/locale/nl/LC_MESSAGES/gxmame.mo
-share/locale/pl/LC_MESSAGES/gxmame.mo
-share/locale/zh_TW/LC_MESSAGES/gxmame.mo
-share/locale/zh_CN/LC_MESSAGES/gxmame.mo
-share/icons/gxmame.png
-share/icons/mini/gxmame.xpm
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/BUGS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/html/gxmame-doc.html
-%%PORTDOCS%%%%DOCSDIR%%/html/gxmame-doc-1.html
-%%PORTDOCS%%%%DOCSDIR%%/html/gxmame-doc-2.html
-%%PORTDOCS%%%%DOCSDIR%%/html/gxmame-doc-3.html
-%%PORTDOCS%%%%DOCSDIR%%/html/gxmame-doc-4.html
-%%PORTDOCS%%%%DOCSDIR%%/html/gxmame-doc-5.html
-%%PORTDOCS%%%%DOCSDIR%%/html/gxmame-doc-6.html
-%%PORTDOCS%%%%DOCSDIR%%/html/gui/metal2.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/includes/gxmame.css
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/includes
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/gui
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec rmdir %D/share/icons/mini 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
-@unexec rmdir %D/share/applications 2>/dev/null || true
+share/gnome/applications/gxmame.desktop
+%%NLS%%share/locale/de/LC_MESSAGES/gxmame.mo
+%%NLS%%share/locale/el/LC_MESSAGES/gxmame.mo
+%%NLS%%share/locale/es/LC_MESSAGES/gxmame.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/gxmame.mo
+%%NLS%%share/locale/it/LC_MESSAGES/gxmame.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/gxmame.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/gxmame.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/gxmame.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/gxmame.mo
+share/gnome/gxmame/gxmame.png
+share/gnome/gxmame/gxmame-general.png
+share/gnome/gxmame/gxmame-screen.png
+share/gnome/pixmaps/gxmame.png
+share/gnome/pixmaps/gxmame.xpm
+share/doc/gxmame/AUTHORS
+share/doc/gxmame/BUGS
+share/doc/gxmame/COPYING
+share/doc/gxmame/ChangeLog
+share/doc/gxmame/NEWS
+share/doc/gxmame/README
+share/doc/gxmame/TODO
+@dirrm share/gnome/gxmame
+@dirrm share/doc/gxmame