diff --git a/sysutils/serpentine/Makefile b/sysutils/serpentine/Makefile
index 4cd4a0acad1b..ce43279b2bb0 100644
--- a/sysutils/serpentine/Makefile
+++ b/sysutils/serpentine/Makefile
@@ -1,29 +1,51 @@
 # New ports collection makefile for:	serpentine
 # Date created:		2005-06-25
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	serpentine
 PORTVERSION=	0.6.1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.berlios.de/${PORTNAME}/
 
 MAINTAINER=	ahze@FreeBSD.org
 COMMENT=	Gnome Audio Cd Buner
 
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/gst/__init__.py:${PORTSDIR}/multimedia/py-gstreamer \
 		xmlproc_parse:${PORTSDIR}/textproc/py-xml
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gst/__init__.py:${PORTSDIR}/multimedia/py-gstreamer \
 		xmlproc_parse:${PORTSDIR}/textproc/py-xml
 
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	pygnomeextras
 USE_GMAKE=	yes
 USE_GSTREAMER=	core
 USE_PYTHON=	2.4+
 
-.include <bsd.port.mk>
+OPTIONS=	MUINE "Cd-Burner Plugin for muine audio player" Off
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_MUINE) || exists(${X11BASE}/bin/muine)
+BUILD_DEPENDS+=	muine:${PORTSDIR}/audio/muine
+RUN_DEPENDS+=	muine:${PORTSDIR}/audio/muine
+PLIST_SUB+=	MUINE=""
+.else
+PLIST_SUB+=	MUINE="@comment "
+.endif
+
+.if defined(WITH_MUINE) || exists(${X11BASE}/bin/muine)
+post-build:
+	cd ${WRKSRC}/muine-plugin && ${GMAKE}
+
+post-install:
+	${MKDIR} ${PREFIX}/lib/muine/plugins
+	${INSTALL_DATA} ${WRKSRC}/muine-plugin/SerpentinePlugin.dll \
+		${PREFIX}/lib/muine/plugins
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/sysutils/serpentine/pkg-descr b/sysutils/serpentine/pkg-descr
index 7a0aae597090..22350b404149 100644
--- a/sysutils/serpentine/pkg-descr
+++ b/sysutils/serpentine/pkg-descr
@@ -1,13 +1,14 @@
 Gnome application for writing CD-Audio discs. It aims for simplicity,
 usability and compability. Its features are:
 
  o Supports multiple formats files, like WAV, MP3, OGG, FLAC and every other
    gstreamer does
  o Save and open PLS, M3U and XSPF playlists
  o Extracts audio from video contents, like an MPEG video
  o Uses audio metadata for better handling
  o Supports drag and drop: drop musics directly from Rhythmbox or Nautilus!
  o Clean and easy to use interface
  o Easy integration with other applications
+ o Muine plugin: allows you to write your playlist directly from Muine.
 
 WWW: http://s1x.homelinux.net/projects/serpentine
diff --git a/sysutils/serpentine/pkg-plist b/sysutils/serpentine/pkg-plist
index 50b2069305ba..6de5fc9bc027 100644
--- a/sysutils/serpentine/pkg-plist
+++ b/sysutils/serpentine/pkg-plist
@@ -1,78 +1,80 @@
 bin/serpentine
+%%MUINE%%lib/muine/plugins/SerpentinePlugin.dll
 %%PYTHON_SITELIBDIR%%/serpentine/__init__.py
 %%PYTHON_SITELIBDIR%%/serpentine/__init__.pyc
 %%PYTHON_SITELIBDIR%%/serpentine/__init__.pyo
 %%PYTHON_SITELIBDIR%%/serpentine/audio.py
 %%PYTHON_SITELIBDIR%%/serpentine/audio.pyc
 %%PYTHON_SITELIBDIR%%/serpentine/audio.pyo
 %%PYTHON_SITELIBDIR%%/serpentine/common.py
 %%PYTHON_SITELIBDIR%%/serpentine/common.pyc
 %%PYTHON_SITELIBDIR%%/serpentine/common.pyo
 %%PYTHON_SITELIBDIR%%/serpentine/components.py
 %%PYTHON_SITELIBDIR%%/serpentine/components.pyc
 %%PYTHON_SITELIBDIR%%/serpentine/components.pyo
 %%PYTHON_SITELIBDIR%%/serpentine/constants.py
 %%PYTHON_SITELIBDIR%%/serpentine/constants.pyc
 %%PYTHON_SITELIBDIR%%/serpentine/constants.pyo
 %%PYTHON_SITELIBDIR%%/serpentine/converting.py
 %%PYTHON_SITELIBDIR%%/serpentine/converting.pyc
 %%PYTHON_SITELIBDIR%%/serpentine/converting.pyo
 %%PYTHON_SITELIBDIR%%/serpentine/export.py
 %%PYTHON_SITELIBDIR%%/serpentine/export.pyc
 %%PYTHON_SITELIBDIR%%/serpentine/export.pyo
 %%PYTHON_SITELIBDIR%%/serpentine/gaw.py
 %%PYTHON_SITELIBDIR%%/serpentine/gaw.pyc
 %%PYTHON_SITELIBDIR%%/serpentine/gaw.pyo
 %%PYTHON_SITELIBDIR%%/serpentine/gdkpiechart.py
 %%PYTHON_SITELIBDIR%%/serpentine/gdkpiechart.pyc
 %%PYTHON_SITELIBDIR%%/serpentine/gdkpiechart.pyo
 %%PYTHON_SITELIBDIR%%/serpentine/gtkutil.py
 %%PYTHON_SITELIBDIR%%/serpentine/gtkutil.pyc
 %%PYTHON_SITELIBDIR%%/serpentine/gtkutil.pyo
 %%PYTHON_SITELIBDIR%%/serpentine/mainwindow.py
 %%PYTHON_SITELIBDIR%%/serpentine/mainwindow.pyc
 %%PYTHON_SITELIBDIR%%/serpentine/mainwindow.pyo
 %%PYTHON_SITELIBDIR%%/serpentine/mastering.py
 %%PYTHON_SITELIBDIR%%/serpentine/mastering.pyc
 %%PYTHON_SITELIBDIR%%/serpentine/mastering.pyo
 %%PYTHON_SITELIBDIR%%/serpentine/operations.py
 %%PYTHON_SITELIBDIR%%/serpentine/operations.pyc
 %%PYTHON_SITELIBDIR%%/serpentine/operations.pyo
 %%PYTHON_SITELIBDIR%%/serpentine/plugins/__init__.py
 %%PYTHON_SITELIBDIR%%/serpentine/plugins/__init__.pyc
 %%PYTHON_SITELIBDIR%%/serpentine/plugins/__init__.pyo
 %%PYTHON_SITELIBDIR%%/serpentine/plugins/plugfilter_dir.py
 %%PYTHON_SITELIBDIR%%/serpentine/plugins/plugfilter_dir.pyc
 %%PYTHON_SITELIBDIR%%/serpentine/plugins/plugfilter_dir.pyo
 %%PYTHON_SITELIBDIR%%/serpentine/plugins/plugfilter_plparser.py
 %%PYTHON_SITELIBDIR%%/serpentine/plugins/plugfilter_plparser.pyc
 %%PYTHON_SITELIBDIR%%/serpentine/plugins/plugfilter_plparser.pyo
 %%PYTHON_SITELIBDIR%%/serpentine/plugins/plugfilter_plsave.py
 %%PYTHON_SITELIBDIR%%/serpentine/plugins/plugfilter_plsave.pyc
 %%PYTHON_SITELIBDIR%%/serpentine/plugins/plugfilter_plsave.pyo
 %%PYTHON_SITELIBDIR%%/serpentine/plugins/plugfilter_xspf.py
 %%PYTHON_SITELIBDIR%%/serpentine/plugins/plugfilter_xspf.pyc
 %%PYTHON_SITELIBDIR%%/serpentine/plugins/plugfilter_xspf.pyo
 %%PYTHON_SITELIBDIR%%/serpentine/preferences.py
 %%PYTHON_SITELIBDIR%%/serpentine/preferences.pyc
 %%PYTHON_SITELIBDIR%%/serpentine/preferences.pyo
 %%PYTHON_SITELIBDIR%%/serpentine/recording.py
 %%PYTHON_SITELIBDIR%%/serpentine/recording.pyc
 %%PYTHON_SITELIBDIR%%/serpentine/recording.pyo
 %%PYTHON_SITELIBDIR%%/serpentine/release.py
 %%PYTHON_SITELIBDIR%%/serpentine/release.pyc
 %%PYTHON_SITELIBDIR%%/serpentine/release.pyo
 %%PYTHON_SITELIBDIR%%/serpentine/services.py
 %%PYTHON_SITELIBDIR%%/serpentine/services.pyc
 %%PYTHON_SITELIBDIR%%/serpentine/services.pyo
 %%PYTHON_SITELIBDIR%%/serpentine/xspf.py
 %%PYTHON_SITELIBDIR%%/serpentine/xspf.pyc
 %%PYTHON_SITELIBDIR%%/serpentine/xspf.pyo
 share/applications/serpentine.desktop
 %%DATADIR%%/serpentine.glade
 @dirrm %%DATADIR%%
 @unexec rmdir %D/share/applications 2> /dev/null || true
 @dirrm %%PYTHON_SITELIBDIR%%/serpentine/plugins
 @dirrm %%PYTHON_SITELIBDIR%%/serpentine
+%%MUINE%%@unexec rmdir %D/lib/muine/plugins 2> /dev/null || true
 @unexec rmdir %D/%%PYTHON_SITELIBDIR%% 2> /dev/null || true
 @unexec rmdir %D/%%PYTHON_LIBDIR%% 2> /dev/null || true