diff --git a/emulators/gxmame/Makefile b/emulators/gxmame/Makefile
index 635702f62d31..dc27816b2fe8 100644
--- a/emulators/gxmame/Makefile
+++ b/emulators/gxmame/Makefile
@@ -7,10 +7,15 @@
 
 PORTNAME=	gxmame
 PORTVERSION=	0.33
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
+PATCH_SITES=	http://shell.n.ml.org/n/tlp/
+PATCHFILES=	gxmame-0.33-xmame074.diff
+PATCH_DIST_STRIP=	-p1
+
 MAINTAINER=	tlp@liquidx.org
 COMMENT=	GXmame is a GTK frontend for xmame
 
@@ -22,6 +27,7 @@ USE_GZIP=	yes
 USE_XLIB=	yes
 USE_GNOME=	gtk12 gdkpixbuf glib12
 
+DOCDIR=		share/doc/${PORTNAME}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-joystick
 
diff --git a/emulators/gxmame/distinfo b/emulators/gxmame/distinfo
index 48116830d056..d8050945084f 100644
--- a/emulators/gxmame/distinfo
+++ b/emulators/gxmame/distinfo
@@ -1 +1,2 @@
 MD5 (gxmame-0.33.tar.gz) = b3469d300ccb6654f893e88823d93799
+MD5 (gxmame-0.33-xmame074.diff) = f10c89038e56c8f6bcd5d502f842791a
diff --git a/emulators/gxmame/files/patch-aa b/emulators/gxmame/files/patch-aa
new file mode 100644
index 000000000000..bf1f6ec84017
--- /dev/null
+++ b/emulators/gxmame/files/patch-aa
@@ -0,0 +1,40 @@
+--- Makefile.in.orig	Fri Nov 21 12:35:25 2003
++++ Makefile.in	Fri Nov 21 12:36:06 2003
+@@ -112,7 +112,7 @@
+ icon2dir = $(datadir)/icons/mini
+ icon2_DATA = gxmame.xpm
+
+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
++docdir = $(datadir)/doc/$(PACKAGE)
+ doc_DATA = BUGS NEWS COPYING AUTHORS README TODO ChangeLog
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -362,7 +362,7 @@
+
+ maintainer-clean-tags:
+
+-distdir = $(PACKAGE)-$(VERSION)
++distdir = $(PACKAGE)
+ top_distdir = $(distdir)
+
+ # This target untars the dist file and tries a VPATH configuration.  Then
+--- html/Makefile.in.orig	Fri Nov 21 12:47:52 2003
++++ html/Makefile.in	Fri Nov 21 12:48:16 2003
+@@ -97,7 +97,7 @@
+
+ EXTRA_DIST = *html includes gui
+
+-htmldir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/html
++htmldir = $(datadir)/doc/$(PACKAGE)/html
+ html_DATA = *.html
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+@@ -143,7 +143,7 @@
+ TAGS:
+
+
+-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
++distdir = $(top_builddir)/$(PACKAGE)/$(subdir)
+
+ subdir = html
+
diff --git a/emulators/gxmame/pkg-descr b/emulators/gxmame/pkg-descr
index 0e8a4568921d..2960edaec0d5 100644
--- a/emulators/gxmame/pkg-descr
+++ b/emulators/gxmame/pkg-descr
@@ -1,4 +1,4 @@
-GXMame is a GTK frontend for xmame. Its goal is to provide an interface 
+GXMame is a GTK frontend for xmame. Its goal is to provide an interface
 much like that of MAME32.
 
 WWW: http://gxmame.sourceforge.net
diff --git a/emulators/gxmame/pkg-plist b/emulators/gxmame/pkg-plist
index edb9c7691e77..7d524cfd9a6c 100644
--- a/emulators/gxmame/pkg-plist
+++ b/emulators/gxmame/pkg-plist
@@ -10,24 +10,24 @@ share/applnk/Games/Arcade/gxmame.desktop
 share/gnome/apps/Games/Arcade/gxmame.desktop
 share/icons/gxmame.png
 share/icons/mini/gxmame.xpm
-%%PORTDOCS%%share/doc/gxmame-0.33/AUTHORS
-%%PORTDOCS%%share/doc/gxmame-0.33/BUGS
-%%PORTDOCS%%share/doc/gxmame-0.33/COPYING
-%%PORTDOCS%%share/doc/gxmame-0.33/ChangeLog
-%%PORTDOCS%%share/doc/gxmame-0.33/NEWS
-%%PORTDOCS%%share/doc/gxmame-0.33/README
-%%PORTDOCS%%share/doc/gxmame-0.33/TODO
-%%PORTDOCS%%share/doc/gxmame-0.33/html/gxmame-doc.html
-%%PORTDOCS%%share/doc/gxmame-0.33/html/gxmame-doc-1.html
-%%PORTDOCS%%share/doc/gxmame-0.33/html/gxmame-doc-2.html
-%%PORTDOCS%%share/doc/gxmame-0.33/html/gxmame-doc.2.html
-%%PORTDOCS%%share/doc/gxmame-0.33/html/gxmame-doc-3.html
-%%PORTDOCS%%share/doc/gxmame-0.33/html/gxmame-doc-4.html
-%%PORTDOCS%%share/doc/gxmame-0.33/html/gxmame-doc-5.html
-%%PORTDOCS%%share/doc/gxmame-0.33/html/gxmame-doc-6.html
-%%PORTDOCS%%share/doc/gxmame-0.33/html/gui/metal2.jpg
-%%PORTDOCS%%share/doc/gxmame-0.33/html/includes/gxmame.css
-%%PORTDOCS%%@dirrm share/doc/gxmame-0.33/html/includes
-%%PORTDOCS%%@dirrm share/doc/gxmame-0.33/html/gui
-%%PORTDOCS%%@dirrm share/doc/gxmame-0.33/html
-%%PORTDOCS%%@dirrm share/doc/gxmame-0.33
+%%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.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%%