diff --git a/audio/mpg321/Makefile b/audio/mpg321/Makefile
index 4bfa6494047..b223ee80849 100644
--- a/audio/mpg321/Makefile
+++ b/audio/mpg321/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.6 2001/09/30 14:24:47 naddy Exp $
+# $OpenBSD: Makefile,v 1.7 2001/10/24 12:06:03 naddy Exp $
 
 COMMENT=	"free clone of mpg123, a command-line mp3 player"
 
-DISTNAME=	mpg321-0.2.0
+DISTNAME=	mpg321-0.2.2
 CATEGORIES=	audio
 NEED_VERSION=	1.435
+HOMEPAGE=	http://sourceforge.net/projects/mpg321/
 
 MAINTAINER=	Christian Weisgerber <naddy@openbsd.org>
 
@@ -14,14 +15,15 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=	http://people.debian.org/~drew/
-DISTFILES=	${DISTNAME:S/-/_/}${EXTRACT_SUFX}
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	mpg321
 
 LIB_DEPENDS=	ao.2::audio/libao \
 		mad.0::audio/mad
 
 SEPARATE_BUILD=	concurrent
 CONFIGURE_STYLE=gnu
+CONFIGURE_ARGS=	--disable-mpg123-symlink
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/audio/mpg321/files/md5 b/audio/mpg321/files/md5
index be89809de09..8bea7ab8f44 100644
--- a/audio/mpg321/files/md5
+++ b/audio/mpg321/files/md5
@@ -1,3 +1,3 @@
-MD5 (mpg321_0.2.0.tar.gz) = 9bf6a0b049c492381819b53e7449455a
-RMD160 (mpg321_0.2.0.tar.gz) = 1b7e00a90498d42c2ae07575e438e53a7411357b
-SHA1 (mpg321_0.2.0.tar.gz) = c6e1e785938ae9b365b6fdafa62397d8d1ab4b89
+MD5 (mpg321-0.2.2.tar.gz) = 3ad9c1fb9bbecefb2cbdda4cffd2b0df
+RMD160 (mpg321-0.2.2.tar.gz) = 115a35e2097ae78fba00eb05706585a36476d90a
+SHA1 (mpg321-0.2.2.tar.gz) = c1f9450a97fd54d83f316253ee499e570522d300
diff --git a/audio/mpg321/patches/patch-getopt_c b/audio/mpg321/patches/patch-getopt_c
new file mode 100644
index 00000000000..9e3962bbb1c
--- /dev/null
+++ b/audio/mpg321/patches/patch-getopt_c
@@ -0,0 +1,20 @@
+$OpenBSD: patch-getopt_c,v 1.1 2001/10/24 12:06:03 naddy Exp $
+--- getopt.c.orig	Mon Oct 15 13:58:52 2001
++++ getopt.c	Mon Oct 15 13:59:14 2001
+@@ -76,16 +76,7 @@
+ # endif
+ #endif
+ 
+-#ifndef _
+-/* This is for other GNU distributions with internationalized messages.
+-   When compiling libc, the _ macro is predefined.  */
+-# ifdef HAVE_LIBINTL_H
+-#  include <libintl.h>
+-#  define _(msgid)	gettext (msgid)
+-# else
+ #  define _(msgid)	(msgid)
+-# endif
+-#endif
+ 
+ /* This version of `getopt' appears to the caller like standard Unix `getopt'
+    but it behaves differently for the user, since it allows the user
diff --git a/audio/mpg321/patches/patch-mad_c b/audio/mpg321/patches/patch-mad_c
deleted file mode 100644
index 8ec04260bb8..00000000000
--- a/audio/mpg321/patches/patch-mad_c
+++ /dev/null
@@ -1,88 +0,0 @@
-$OpenBSD: patch-mad_c,v 1.1 2001/09/30 14:24:47 naddy Exp $
---- mad.c.orig	Mon Sep 24 14:27:40 2001
-+++ mad.c	Mon Sep 24 15:28:55 2001
-@@ -554,44 +554,47 @@ enum mad_flow move(buffer *buf, signed l
-     
- int calc_length(char *file, buffer *buf)
- {
--    FILE * f;
-+    int f;
-     struct stat filestat;
-     void *fdm;
-     char buffer[3];
- 
--    if (stat(file, &filestat) == -1)
-+    f = open(file, O_RDONLY);
-+
-+    if (f < 0)
-     {
-         mpg321_error(file);
-         return -1;
-     }
- 
--    f = fopen(file, "r");
--
--    if (f == NULL)
-+    if (fstat(f, &filestat) < 0)
-     {
-         mpg321_error(file);
-+        close(f);
-         return -1;
-     }
- 
-     if (!S_ISREG(filestat.st_mode))
-     {
-         fprintf(stderr, "%s: Not a regular file\n", file);
--        fclose(f);
-+        close(f);
-         return -1;
-     }
- 
-     /* TAG checking is adapted from XMMS */
-     buf->length = filestat.st_size;
- 
--    if (fseek(f, -128, SEEK_END) < 0)
-+    if (lseek(f, -128, SEEK_END) < 0)
-     {
-         mpg321_error(file);
-+        close(f);
-         return -1;
-     }    
- 
--    if (read(fileno(f), buffer, 3) != 3)
-+    if (read(f, buffer, 3) != 3)
-     {
-         fprintf(stderr, "Couldnt read 3 bytes from %s\n", file);
-+        close(f);
-         return -1;
-     }
-     
-@@ -600,12 +603,11 @@ int calc_length(char *file, buffer *buf)
-         buf->length -= 128; /* Correct for id3 tags */
-     }
-     
--    rewind(f);
--
--    fdm = mmap(0, buf->length, PROT_READ, MAP_SHARED, fileno(f), 0);
-+    fdm = mmap(0, buf->length, PROT_READ, MAP_SHARED, f, 0);
-     if (fdm == MAP_FAILED)
-     {
-         mpg321_error(file);
-+        close(f);
-         return -1;
-     }
- 
-@@ -616,11 +618,11 @@ int calc_length(char *file, buffer *buf)
-     if (munmap(fdm, buf->length) == -1)
-     {
-         mpg321_error(file);
--        fclose(f);
-+        close(f);
-         return -1;
-     }
- 
--    if (fclose(f) == EOF)
-+    if (close(f) < 0)
-     {
-         mpg321_error(file);
-         return -1;
diff --git a/audio/mpg321/patches/patch-playlist_c b/audio/mpg321/patches/patch-playlist_c
deleted file mode 100644
index 346d1d5acb1..00000000000
--- a/audio/mpg321/patches/patch-playlist_c
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-playlist_c,v 1.1 2001/09/30 14:24:47 naddy Exp $
---- playlist.c.orig	Mon Sep 24 21:05:52 2001
-+++ playlist.c	Mon Sep 24 21:06:24 2001
-@@ -48,6 +48,7 @@ playlist * new_playlist()
-     pl->files_size = DEFAULT_PLAYLIST_SIZE;
-     pl->numfiles = 0;
-     pl->random_play = 0;
-+    strcpy(pl->remote_file, "");
-     
-     return pl;
- }
diff --git a/audio/mpg321/pkg/DESCR b/audio/mpg321/pkg/DESCR
index 298d608019e..e86edb8c115 100644
--- a/audio/mpg321/pkg/DESCR
+++ b/audio/mpg321/pkg/DESCR
@@ -1,9 +1,16 @@
-mpg321 is a completely free clone of mpg123.
+mpg321 is a clone of the popular mpg123 command-line mp3 player. It should
+function as a drop-in replacement for mpg123 in many cases. While some of
+the functionality of mpg123 is not yet implemented, mpg321 should function 
+properly in most cases for most people, such as for frontends such as
+gqmpeg. 
 
-mpg321 has been tested to work with gqmpeg.  It should work with
-other frontends, but isn't guaranteed.  mpg321 is built on top of
-libmad, which was written by Robert Leslie, and is a fully ISO-compliant
-MPEG decoder, meaning it's very accurate.  It also operates entirely
-within fixed-point arithmetic.
+mpg321 is based on the mad MPEG audio decoding library. It therefore is
+highly accurate, and also uses only fixed-point calculation, making it
+more efficient on machines without a floating-point unit.
 
-ID3 tags are not supported at all, yet.
+While mpg321 is not as fast as the non-free mpg123 on systems which have a
+floating point unit, it comes under the GNU General Public License, which
+allows greater freedom to its users. For most people who want mpg123,
+mpg321 is a better alternative.
+
+WWW: ${HOMEPAGE}