diff --git a/audio/streamripper/Makefile b/audio/streamripper/Makefile
index a242a79b16e..84e0025fc12 100644
--- a/audio/streamripper/Makefile
+++ b/audio/streamripper/Makefile
@@ -1,28 +1,32 @@
-# $OpenBSD: Makefile,v 1.7 2005/02/07 19:01:48 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.8 2005/09/05 20:19:58 fgsch Exp $
 
-COMMENT=		"rip shoutcast streams to local mp3s"
+COMMENT=	"rip shoutcast streams to local mp3s"
 
-DISTNAME=		streamripper-1.0.5
-CATEGORIES=		audio
+DISTNAME=	streamripper-1.61.11
+CATEGORIES=	audio
 
-HOMEPAGE=		http://streamripper.sourceforge.net/
+HOMEPAGE=	http://streamripper.sourceforge.net/
+
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=streamripper/}
+
+MODULES=	converters/libiconv
 
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		c m pthread
 
-MASTER_SITES=		http://streamripper.sourceforge.net/dl/
+WANTLIB=	c m pthread
 
-CONFIGURE_STYLE=	gnu
+LIB_DEPENDS=	mad.2::audio/libmad \
+		ogg.5.2::audio/libogg \
+		vorbis.3.0::audio/libvorbis
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/streamripper ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/streamripper
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/streamripper
+CONFIGURE_STYLE= gnu
+CONFIGURE_ENV=	CPPLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
-NO_REGRESS=		Yes
+NO_REGRESS=	Yes
 
 .include <bsd.port.mk>
diff --git a/audio/streamripper/distinfo b/audio/streamripper/distinfo
index 370554a6d52..a91365d4008 100644
--- a/audio/streamripper/distinfo
+++ b/audio/streamripper/distinfo
@@ -1,4 +1,4 @@
-MD5 (streamripper-1.0.5.tar.gz) = 851b118bc96913c0cff6bca6a09c183c
-RMD160 (streamripper-1.0.5.tar.gz) = 0ed887ad0fa480dfaba3b3919f873cd04e8cdb0f
-SHA1 (streamripper-1.0.5.tar.gz) = ccdcd7be76f74a6e0136d8bf72fc52494f8a4624
-SIZE (streamripper-1.0.5.tar.gz) = 133001
+MD5 (streamripper-1.61.11.tar.gz) = 0e85275378fb6f43ac1aa5aa938220bd
+RMD160 (streamripper-1.61.11.tar.gz) = d5704fb7c8abfe3a015ffd7d7530729063e38c93
+SHA1 (streamripper-1.61.11.tar.gz) = 16c0ecc367cff640fdf1147019a51a72b93c8fbe
+SIZE (streamripper-1.61.11.tar.gz) = 1180121
diff --git a/audio/streamripper/patches/patch-Makefile_in b/audio/streamripper/patches/patch-Makefile_in
deleted file mode 100644
index cc2b5ee926e..00000000000
--- a/audio/streamripper/patches/patch-Makefile_in
+++ /dev/null
@@ -1,30 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.2 2002/09/03 06:11:42 mark Exp $
---- Makefile.in.orig	Sat Aug  4 20:08:50 2001
-+++ Makefile.in	Mon Sep  2 23:06:19 2002
-@@ -1,11 +1,11 @@
- # Generated automatically from Makefile.in by configure.
- #Makefile for streamripper
- 
--INSTALL_PROGRAM = @INSTALL_PROGRAM@
--bindir = /usr/local/bin
--SHELL = /bin/sh
-+#INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+#bindir = /usr/local/bin
-+#SHELL = /bin/sh
- 
--INSTALL = /usr/bin/install -c
-+#INSTALL = /usr/bin/install -c
- 
- all: consoleapp
- 
-@@ -17,7 +17,7 @@ consoleapp: 
- clean:
- 	rm -f streamripper *.o lib/*.o mpglib/*.o console/*.o *.core core
- 
--install:
--	@echo "- Installing streamripper"
--	@ $(INSTALL_PROGRAM) streamripper $(bindir)
-+#install:
-+#	@echo "- Installing streamripper"
-+#	@ $(INSTALL_PROGRAM) streamripper $(bindir)
- 
diff --git a/audio/streamripper/pkg/PLIST b/audio/streamripper/pkg/PLIST
index e2285a08805..21e8e9f4432 100644
--- a/audio/streamripper/pkg/PLIST
+++ b/audio/streamripper/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.3 2004/08/06 14:37:28 espie Exp $
+@comment $OpenBSD: PLIST,v 1.4 2005/09/05 20:19:58 fgsch Exp $
 bin/streamripper
-share/doc/streamripper/
-share/doc/streamripper/README
+@man man/man1/streamripper.1