diff --git a/audio/spiralloops/Makefile b/audio/spiralloops/Makefile
index ad02e62fc82b..119517e82482 100644
--- a/audio/spiralloops/Makefile
+++ b/audio/spiralloops/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	spiralloops
 PORTVERSION=	2.0.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	audio
 MASTER_SITES=	http://www.pawfal.org/Software/SpiralLoops/dload/
 DISTNAME=	SpiralLoops-${PORTVERSION}
@@ -11,17 +11,21 @@ DISTNAME=	SpiralLoops-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Loop-based sampler
 
+LICENSE=	GPLv2
+
 LIB_DEPENDS=	libfltk.so:${PORTSDIR}/x11-toolkits/fltk
 
-NO_STAGE=	yes
-DOCDIR=		share/doc/${PORTNAME}
-DOC_FILES=	CHANGES COPYING README
 GNU_CONFIGURE=	yes
-MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
-PLIST=		${WRKDIR}/pkg-plist
+MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}" 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
+PLIST_FILES=	bin/SpiralLoops
+PORTDOCS=	CHANGES README
+
+DESKTOP_ENTRIES="SpiralLoops" "" "" "SpiralLoops" "" false
+
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.pre.mk>
 
 post-patch:
@@ -29,7 +33,7 @@ post-patch:
 	${SED} -E "s:-ldl::g; \
 		s:^CFLAGS:XCFLAGS:g; \
 		s:^CXXFLAGS:XCXXFLAGS:g; \
-		s:-O3:${PTHREAD_CFLAGS}:g; \
+		s:-O3::g; \
 		s:CFLAGS =:CFLAGS +=:g; \
 		s:CXXFLAGS=:CXXFLAGS+=:g; \
 		s:-lm:${PTHREAD_LIBS} -lm:g; \
@@ -41,21 +45,9 @@ post-patch:
 	   ${REINPLACE_CMD} -e '/^#include <FL/s|.h>$$|.H>|; /^#include "FL/s|.h"$$|.H"|; \
 	   s|fl_file_chooser.H|Fl_File_Chooser.H|g; s|iostream.h|iostream|; s|fstream.h|fstream|'
 
-pre-install:
-	${ECHO_CMD} bin/SpiralLoops > ${PLIST}
-.if ${PORT_OPTIONS:MDOCS}
-.for i in ${DOC_FILES}
-	${ECHO_CMD} ${DOCDIR}/`${BASENAME} ${i}` >> ${PLIST}
-.endfor
-	${ECHO_CMD} @dirrm ${DOCDIR} >> ${PLIST}
-.endif
-
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/SpiralLoops ${PREFIX}/bin
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-.for i in ${DOC_FILES}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
-.endfor
-.endif
+	${INSTALL_PROGRAM} ${WRKSRC}/SpiralLoops ${STAGEDIR}${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+
 .include <bsd.port.post.mk>