diff --git a/audio/sidplay/Makefile b/audio/sidplay/Makefile
index 1299f138a461..ce7eb4064640 100644
--- a/audio/sidplay/Makefile
+++ b/audio/sidplay/Makefile
@@ -3,25 +3,27 @@
 
 PORTNAME=	sidplay
 PORTVERSION=	1.0.9
+DISTVERSIONPREFIX=	base-
 CATEGORIES=	audio emulators
-MASTER_SITES=	http://bsd-geek.de/FreeBSD/distfiles/
-DISTNAME=	${PORTNAME}-base-${PORTVERSION}
+MASTER_SITES=	http://bsd-geek.de/FreeBSD/distfiles/ \
+		http://www.sourcefiles.org/Multimedia/Module_Players/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Commodore SID-chip emulator that plays SID music files
 
+LICENSE=	GPLv2 # (or later)
+
 LIB_DEPENDS=	libsidplay.so:${PORTSDIR}/audio/libsidplay
 
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-sidplay-includes=${LOCALBASE}/include \
 		--with-sidplay-library=${LOCALBASE}/lib
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-base-${PORTVERSION}
-GNU_CONFIGURE=	yes
-NO_STAGE=	yes
+PLIST_FILES=	bin/sid2wav bin/sidcon bin/sidplay
 
 post-install:
-	${STRIP_CMD} ${PREFIX}/bin/sidplay ${PREFIX}/bin/sid2wav \
-		${PREFIX}/bin/sidcon
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/sidplay \
+		${STAGEDIR}${PREFIX}/bin/sid2wav \
+		${STAGEDIR}${PREFIX}/bin/sidcon
 
 .include <bsd.port.mk>
diff --git a/audio/sidplay/files/patch-sid2wav.cpp b/audio/sidplay/files/patch-sid2wav.cpp
new file mode 100644
index 000000000000..2da4ab773325
--- /dev/null
+++ b/audio/sidplay/files/patch-sid2wav.cpp
@@ -0,0 +1,32 @@
+--- sid2wav.cpp.orig
++++ sid2wav.cpp
+@@ -18,9 +18,9 @@
+ //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ //
+ 
+-#include <iostream.h>
+-#include <iomanip.h>
+-#include <fstream.h>
++#include <iostream>
++#include <iomanip>
++#include <fstream>
+ #include <string.h>
+ 
+ #include <stdlib.h>
+@@ -39,6 +39,16 @@
+ #include <sidplay/fformat.h>
+ #include <sidplay/myendian.h>
+ 
++using std::cerr;
++using std::cout;
++using std::endl;
++using std::dec;
++using std::flush;
++using std::hex;
++using std::ios;
++using std::setfill;
++using std::setw;
++
+ const char s2w_version[] = "1.8";
+ 
+ struct wav_hdr                  // little endian
diff --git a/audio/sidplay/files/patch-sidcon.cpp b/audio/sidplay/files/patch-sidcon.cpp
new file mode 100644
index 000000000000..a61473a7d24d
--- /dev/null
+++ b/audio/sidplay/files/patch-sidcon.cpp
@@ -0,0 +1,23 @@
+--- sidcon.cpp.orig
++++ sidcon.cpp
+@@ -25,12 +25,18 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <iostream.h>
+-#include <iomanip.h>
++#include <iostream>
++#include <iomanip>
+ 
+ #include <sidplay/sidtune.h>
+ #include <sidplay/fformat.h>
+ 
++using std::cerr;
++using std::cin;
++using std::cout;
++using std::endl;
++using std::flush;
++
+ static bool toPSID = true,
+     toSIDPLAY = false,
+     checkOnly = false,
diff --git a/audio/sidplay/files/patch-sidplay.cpp b/audio/sidplay/files/patch-sidplay.cpp
new file mode 100644
index 000000000000..a0113920df32
--- /dev/null
+++ b/audio/sidplay/files/patch-sidplay.cpp
@@ -0,0 +1,28 @@
+--- sidplay.cpp.orig
++++ sidplay.cpp
+@@ -18,8 +18,8 @@
+ //
+ 
+ #include <ctype.h>
+-#include <iomanip.h>
+-#include <fstream.h>
++#include <iomanip>
++#include <iostream>
+ #include <signal.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -41,6 +41,14 @@
+ #define DISALLOW_STEREO_SOUND
+ #endif
+ 
++using std::cerr;
++using std::cout;
++using std::dec;
++using std::endl;
++using std::hex;
++using std::setfill;
++using std::setw;
++
+ // Error and status message numbers.
+ enum
+ {
diff --git a/audio/sidplay/pkg-plist b/audio/sidplay/pkg-plist
deleted file mode 100644
index c84bcd8ce9c0..000000000000
--- a/audio/sidplay/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/sidplay
-bin/sid2wav
-bin/sidcon