diff --git a/audio/streamripper/Makefile b/audio/streamripper/Makefile
index 2685399fa24..6f7f1900447 100644
--- a/audio/streamripper/Makefile
+++ b/audio/streamripper/Makefile
@@ -1,16 +1,15 @@
-# $OpenBSD: Makefile,v 1.14 2007/09/15 21:26:03 simon Exp $
+# $OpenBSD: Makefile,v 1.15 2008/12/11 08:40:25 pea Exp $
 
 COMMENT=	rip shoutcast streams to local mp3s
 
-DISTNAME=	streamripper-1.61.11
-PKGNAME=	${DISTNAME}p3
+DISTNAME=	streamripper-1.64.0
 CATEGORIES=	audio
 
 HOMEPAGE=	http://streamripper.sourceforge.net/
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=streamripper/}
 
-MODULES=	converters/libiconv
+MODULES=	devel/gettext
 
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
@@ -18,13 +17,16 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB=	c m pthread
+WANTLIB=	c m pthread iberty ncurses
 
 LIB_DEPENDS=	mad.>=2::audio/libmad \
 		ogg.>=5.2::audio/libogg \
-		vorbis.>=3.0::audio/libvorbis
+		vorbis.>=3.0::audio/libvorbis \
+		glib-2.0::devel/glib2 \
+		cdk::devel/cdk
 
-CONFIGURE_STYLE= gnu
+AUTOCONF_VERSION=2.61
+CONFIGURE_STYLE= autoconf
 CONFIGURE_ENV=	CPPLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/audio/streamripper/distinfo b/audio/streamripper/distinfo
index d77cd92a726..3b1fd1b5ecc 100644
--- a/audio/streamripper/distinfo
+++ b/audio/streamripper/distinfo
@@ -1,5 +1,5 @@
-MD5 (streamripper-1.61.11.tar.gz) = DoUnU3j7b0OsGqWqk4IgvQ==
-RMD160 (streamripper-1.61.11.tar.gz) = 1XBPt8ir/joBX/19dTBykGPjjJM=
-SHA1 (streamripper-1.61.11.tar.gz) = FsDsw2fP9kD98RRwGaUacrk8j74=
-SHA256 (streamripper-1.61.11.tar.gz) = 0lu7mUCeEz4DOjsoXdS/bg6SfTIuwv682ElnBFEzneM=
-SIZE (streamripper-1.61.11.tar.gz) = 1180121
+MD5 (streamripper-1.64.0.tar.gz) = +HVIE93CvJbEw0QOJayotg==
+RMD160 (streamripper-1.64.0.tar.gz) = ypliiUtyOOuhRb3R1pJ1cBTTm30=
+SHA1 (streamripper-1.64.0.tar.gz) = sJ92dbuDeWqkEsuUSBADRBw4KCE=
+SHA256 (streamripper-1.64.0.tar.gz) = pT9Q0m3jYQ5ZoH6vgcydo0iq97NbxKMC8uX23vsSl64=
+SIZE (streamripper-1.64.0.tar.gz) = 839535
diff --git a/audio/streamripper/patches/patch-lib_http_c b/audio/streamripper/patches/patch-lib_http_c
deleted file mode 100644
index 064cf2d7af5..00000000000
--- a/audio/streamripper/patches/patch-lib_http_c
+++ /dev/null
@@ -1,30 +0,0 @@
-$OpenBSD: patch-lib_http_c,v 1.1 2006/08/17 17:02:13 naddy Exp $
---- lib/http.c.orig	Sat Apr  9 06:06:15 2005
-+++ lib/http.c	Thu Aug 17 18:29:22 2006
-@@ -212,7 +212,7 @@ httplib_parse_sc_header(const char *url,
-     int rc;
-     char *start;
-     char versionbuf[64];
--    char stempbr[50];
-+    char stempbr[MAX_ICY_STRING];
-     URLINFO url_info;
-     int url_path_len;
-     int content_type_by_url;
-@@ -328,7 +328,7 @@ httplib_parse_sc_header(const char *url,
-     else if ((start = (char *)strstr(header, "SHOUTcast")) != NULL) {
- 	strcpy(info->server, "SHOUTcast/");
- 	if ((start = (char *)strstr(start, "Server/")) != NULL) {
--	    sscanf(start, "Server/%[^<]<", versionbuf);
-+	    sscanf(start, "Server/%63[^<]<", versionbuf);
- 	    strcat(info->server, versionbuf);
- 	}
- 
-@@ -346,7 +346,7 @@ httplib_parse_sc_header(const char *url,
- 	if (!info->server[0]) {
- 	    strcpy(info->server, "icecast/");
- 	    if ((start = (char *)strstr(start, "version ")) != NULL) {
--		sscanf(start, "version %[^<]<", versionbuf);
-+		sscanf(start, "version %63[^<]<", versionbuf);
- 		strcat(info->server, versionbuf);
- 	    }
- 	}
diff --git a/audio/streamripper/patches/patch-lib_relaylib_c b/audio/streamripper/patches/patch-lib_relaylib_c
deleted file mode 100644
index 8a8ca7acb6f..00000000000
--- a/audio/streamripper/patches/patch-lib_relaylib_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-lib_relaylib_c,v 1.1 2005/09/05 20:48:15 fgsch Exp $
---- lib/relaylib.c.orig	Mon Aug 22 17:53:31 2005
-+++ lib/relaylib.c	Mon Aug 22 17:54:01 2005
-@@ -492,7 +492,7 @@ void thread_accept(void *notused)
- 			    ret, header_len);
- 			client_relay_header_release(client_http_header);
- 			if (ret == header_len) {
--			    debug_printf ("Relay: strlen(client_http_header) is now %d\n", strlen(client_http_header));
-+			    debug_printf ("Relay: strlen(client_http_header) is now %d\n", header_len);
-                             newhostsock = malloc(sizeof(*newhostsock));
-                             if (newhostsock != NULL)
-                             {
diff --git a/audio/streamripper/pkg/PLIST b/audio/streamripper/pkg/PLIST
index 21e8e9f4432..9b7649931d8 100644
--- a/audio/streamripper/pkg/PLIST
+++ b/audio/streamripper/pkg/PLIST
@@ -1,3 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.4 2005/09/05 20:19:58 fgsch Exp $
-bin/streamripper
+@comment $OpenBSD: PLIST,v 1.5 2008/12/11 08:40:25 pea Exp $
+@bin bin/streamripper
 @man man/man1/streamripper.1