diff --git a/audio/gxmms2/Makefile b/audio/gxmms2/Makefile
index f5d69ae7b638..4245368edd8e 100644
--- a/audio/gxmms2/Makefile
+++ b/audio/gxmms2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gxmms2
-PORTVERSION=	0.6.3
+PORTVERSION=	0.6.4
 CATEGORIES=	audio
 MASTER_SITES=	http://wejp.k.vu/projects/xmms2/
 
@@ -15,11 +15,13 @@ COMMENT=	A GTK2 based XMMS2 client, written in C
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libxmmsclient.so:${PORTSDIR}/audio/xmms2
 
-USE_X_PREFIX=	yes
 USE_GNOME=	gtk20
 
 ALL_TARGET=	${PORTNAME}
-PLIST_FILES=	bin/gxmms2
+
+PLIST_FILES=	bin/gxmms2 \
+				%%DATADIR%%/gxmms2_mini.xpm
+PLIST_DIRS=		%%DATADIR%%
 
 .include <bsd.port.pre.mk>
 
@@ -29,5 +31,7 @@ PLIST_FILES=	bin/gxmms2
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
+	${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/gxmms2src/gxmms2_mini.xpm ${DATADIR}
 
 .include <bsd.port.post.mk>
diff --git a/audio/gxmms2/distinfo b/audio/gxmms2/distinfo
index 659659cc7918..5849f6626c0f 100644
--- a/audio/gxmms2/distinfo
+++ b/audio/gxmms2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gxmms2-0.6.3.tar.gz) = 5f31e1624559ee89ad5ab79550c995b0
-SHA256 (gxmms2-0.6.3.tar.gz) = c72043f576f727cb67bba1747e3f4ae65f876a94ab76c7cc5c15f012d379e36b
-SIZE (gxmms2-0.6.3.tar.gz) = 75117
+MD5 (gxmms2-0.6.4.tar.gz) = 985b2ea8b757235ec559d7014b626ff4
+SHA256 (gxmms2-0.6.4.tar.gz) = b95390dfcd6f25ff14813e19d9f4d4d780abaad5e229a67bca14a4037060add6
+SIZE (gxmms2-0.6.4.tar.gz) = 78252