diff --git a/games/Makefile b/games/Makefile
index 44949e9efe2f..b67eb8529163 100644
--- a/games/Makefile
+++ b/games/Makefile
@@ -157,6 +157,7 @@
     SUBDIR += gnmm
     SUBDIR += gno3dtet
     SUBDIR += gnocatan
+    SUBDIR += gnome-music-quiz
     SUBDIR += gnomeattacks
     SUBDIR += gnomebreakout
     SUBDIR += gnomechess
diff --git a/games/gnome-music-quiz/Makefile b/games/gnome-music-quiz/Makefile
new file mode 100644
index 000000000000..3f95cb42c112
--- /dev/null
+++ b/games/gnome-music-quiz/Makefile
@@ -0,0 +1,34 @@
+# New ports collection makefile for:	GNOME Music Quiz
+# Date created:			20 Jun 2004
+# Whom:				Jean-Yves Lefort <jylefort@brutele.be>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	gnome-music-quiz
+PORTVERSION=	0.1
+CATEGORIES=	games audio
+MASTER_SITES=	http://ishamael.tunkeymicket.com/tarballs/
+DISTNAME=	mq-${PORTVERSION}
+
+MAINTAINER=	jylefort@brutele.be
+COMMENT=	A game similar to the television show 'Name That Tune'
+
+RUN_DEPENDS=	rhythmbox:${PORTSDIR}/audio/rhythmbox
+
+USE_X_PREFIX=	yes
+USE_GNOME=	gnomeprefix libgnomeui gstreamerplugins
+USE_LIBTOOL_VER=	15
+
+post-extract:
+	@${RM} -f \
+		${WRKSRC}/intltool-extract.in \
+		${WRKSRC}/intltool-merge.in \
+		${WRKSRC}/intltool-update.in
+	@${CP} -f \
+		${LOCALBASE}/share/intltool/intltool-extract.in \
+		${LOCALBASE}/share/intltool/intltool-merge.in \
+		${LOCALBASE}/share/intltool/intltool-update.in \
+		${WRKSRC}
+
+.include <bsd.port.mk>
diff --git a/games/gnome-music-quiz/distinfo b/games/gnome-music-quiz/distinfo
new file mode 100644
index 000000000000..0781e0a4a5de
--- /dev/null
+++ b/games/gnome-music-quiz/distinfo
@@ -0,0 +1,2 @@
+MD5 (mq-0.1.tar.gz) = 8f2051612c0a1dcecbd6cd0b2f30d397
+SIZE (mq-0.1.tar.gz) = 817333
diff --git a/games/gnome-music-quiz/files/patch-src::mq.c b/games/gnome-music-quiz/files/patch-src::mq.c
new file mode 100644
index 000000000000..d51d81fe8205
--- /dev/null
+++ b/games/gnome-music-quiz/files/patch-src::mq.c
@@ -0,0 +1,40 @@
+--- src/mq.c.orig	Sun Jun 20 20:21:26 2004
++++ src/mq.c	Sun Jun 20 21:58:03 2004
+@@ -440,15 +440,30 @@
+ 
+ static gboolean round_entries_desensitize_timeout(gpointer data)
+ {
+-	gint32 i = 0;
++	int i;
++	int entries_left = 0;
++	int n;
++	int j = 0;
+ 
+-	do {
+-		i = g_random_int_range(0,5);
+-	} while (round_entries_sensitive[i] == FALSE || i == round_answer);
+-
+-	round_entries_sensitive[i] = FALSE;
+-	gtk_widget_set_sensitive(GTK_WIDGET(game_buttons[i]),FALSE);
++	for (i = 0; i < 5; i++)
++		if (round_entries_sensitive[i] && i != round_answer)
++			entries_left++;
+ 
++	if (entries_left == 0) {
++		round_entries_desensitize_timeout_id = -1;
++		return FALSE;
++	}
++	
++	n = g_random_int_range(0, entries_left);
++	for (i = 0; i < 5; i++)
++		if (round_entries_sensitive[i] && i != round_answer) {
++			if (j++ == n) {
++				round_entries_sensitive[i] = FALSE;
++				gtk_widget_set_sensitive(GTK_WIDGET(game_buttons[i]), FALSE);
++				break;
++			}
++		}
++	      
+ 	return TRUE;
+ }
+ 
diff --git a/games/gnome-music-quiz/pkg-descr b/games/gnome-music-quiz/pkg-descr
new file mode 100644
index 000000000000..2c15e0a2340f
--- /dev/null
+++ b/games/gnome-music-quiz/pkg-descr
@@ -0,0 +1,10 @@
+GNOME Music Quiz is a game similar to the television show 'Name That
+Tune'. Players are quizzed on songs from their Rhythmbox music
+library. The faster a player identifies a song the more points he or
+she receives. Great for parties or to learn your music and impress
+your friends.
+
+WWW: http://ishamael.tunkeymicket.com/mq.php
+
+- Jean-Yves Lefort
+jylefort@brutele.be
diff --git a/games/gnome-music-quiz/pkg-plist b/games/gnome-music-quiz/pkg-plist
new file mode 100644
index 000000000000..f99a923fd853
--- /dev/null
+++ b/games/gnome-music-quiz/pkg-plist
@@ -0,0 +1,3 @@
+bin/mq
+share/gnome/applications/mq.desktop
+share/gnome/pixmaps/gnome-mq.png