diff --git a/audio/Makefile b/audio/Makefile
index db4a32157f3d..ec053e26b451 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -180,6 +180,7 @@
     SUBDIR += gdam
     SUBDIR += gdrdao
     SUBDIR += ghostess
+    SUBDIR += gimmix
     SUBDIR += gkrellmms
     SUBDIR += gkrellmms2
     SUBDIR += gkrellmss
diff --git a/audio/gimmix/Makefile b/audio/gimmix/Makefile
new file mode 100644
index 000000000000..4e03fa1013ce
--- /dev/null
+++ b/audio/gimmix/Makefile
@@ -0,0 +1,25 @@
+# New ports collection makefile for:   gimmix
+# Date created:                                11 April 2007
+# Whom:                                        Matthieu Guegan <matt.guegan@free.fr>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	gimmix
+PORTVERSION=	0.4.1
+CATEGORIES=	audio
+MASTER_SITES=	${MASTER_SITE_BERLIOS}
+MASTER_SITE_SUBDIR=	gimmix
+
+MAINTAINER=	matt.guegan@free.fr
+COMMENT=	Gimmix is a graphical MPD client written in C using GTK+2
+
+LIB_DEPENDS=	mpd:${PORTSDIR}/audio/libmpd \
+		tag.5:${PORTSDIR}/audio/taglib
+
+USE_GNOME=	gtk20 libglade2
+USE_BZIP2=	yes
+
+GNU_CONFIGURE=	yes
+
+.include <bsd.port.mk>
diff --git a/audio/gimmix/distinfo b/audio/gimmix/distinfo
new file mode 100644
index 000000000000..9b8feec585e2
--- /dev/null
+++ b/audio/gimmix/distinfo
@@ -0,0 +1,3 @@
+MD5 (gimmix-0.4.1.tar.bz2) = 2d9e8f5a210e7b5f974d254fa8e11030
+SHA256 (gimmix-0.4.1.tar.bz2) = 8c4ca2c0f6377a3f2545b5824db058c5a1dc598c11acb45d2298cbcc77953718
+SIZE (gimmix-0.4.1.tar.bz2) = 499360
diff --git a/audio/gimmix/pkg-descr b/audio/gimmix/pkg-descr
new file mode 100644
index 000000000000..42b78e79efd9
--- /dev/null
+++ b/audio/gimmix/pkg-descr
@@ -0,0 +1,16 @@
+Gimmix is a graphical Music player daemon (MPD) client written in C
+using GTK+2.
+
+Features:
+=========
+* Simple and Clean Interface.
+* Library Browser.
+* Library search. (search by artist, album, filename, etc)
+* Playlist management (manage mpd playlists)
+* ID3v2 tag editing support.
+* System tray icon support.
+* Support for controlling gimmix through Keyboard.
+* Notification support (Displays the currently playing song in systray).
+* Small memory footprint.
+
+WWW: http://gimmix.berlios.de/index.php
diff --git a/audio/gimmix/pkg-plist b/audio/gimmix/pkg-plist
new file mode 100644
index 000000000000..3577c335ec8a
--- /dev/null
+++ b/audio/gimmix/pkg-plist
@@ -0,0 +1,12 @@
+bin/gimmix
+share/applications/gimmix.desktop
+%%DATADIR%%/gimmix.glade
+%%DATADIR%%/gimmix_firstrun.png
+share/pixmaps/gimmix.png
+share/pixmaps/gimmix_logo_small.png
+share/pixmaps/gimmix_playlist.png
+@dirrmtry share/pixmaps
+@dirrm %%DATADIR%%
+@dirrmtry share/applications
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true