diff --git a/audio/mp3blaster/Makefile b/audio/mp3blaster/Makefile
index 108a1f8bcbd..8a18f6ff55e 100644
--- a/audio/mp3blaster/Makefile
+++ b/audio/mp3blaster/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.3 2002/07/20 20:15:04 naddy Exp $
+# $OpenBSD: Makefile,v 1.4 2002/10/23 15:24:34 naddy Exp $
 
 COMMENT=	"text console audio player with an interactive interface"
 
-DISTNAME=	mp3blaster-3.1.1
+DISTNAME=	mp3blaster-3.1.3
 CATEGORIES=	audio
 HOMEPAGE=	http://www.stack.nl/~brama/mp3blaster/
 
diff --git a/audio/mp3blaster/distinfo b/audio/mp3blaster/distinfo
index 889c6de9578..52c3df220c8 100644
--- a/audio/mp3blaster/distinfo
+++ b/audio/mp3blaster/distinfo
@@ -1,3 +1,3 @@
-MD5 (mp3blaster-3.1.1.tar.gz) = 6713385086fdfdb91ba08e536f5db12e
-RMD160 (mp3blaster-3.1.1.tar.gz) = 2e3262ffb59277eae8d6d6f7bed0555ca6a67023
-SHA1 (mp3blaster-3.1.1.tar.gz) = 794e87ac78f915bedf72a685080e729bf2f13337
+MD5 (mp3blaster-3.1.3.tar.gz) = 38beb6a5648cbca4ec87ee14b0982283
+RMD160 (mp3blaster-3.1.3.tar.gz) = f83c5db5b249b2c4e827b9dc5e6f8f8341e98b15
+SHA1 (mp3blaster-3.1.3.tar.gz) = 516f0b55443c9b7035ef2a82903b369c13a8f001
diff --git a/audio/mp3blaster/patches/patch-nmixer_getopt_h b/audio/mp3blaster/patches/patch-nmixer_getopt_h
new file mode 100644
index 00000000000..da3fe5faa8d
--- /dev/null
+++ b/audio/mp3blaster/patches/patch-nmixer_getopt_h
@@ -0,0 +1,12 @@
+$OpenBSD: patch-nmixer_getopt_h,v 1.1 2002/10/23 15:24:34 naddy Exp $
+--- nmixer/getopt.h.orig	Wed Oct 23 16:49:16 2002
++++ nmixer/getopt.h	Wed Oct 23 16:49:25 2002
+@@ -103,7 +103,7 @@ struct option
+    errors, only prototype getopt for the GNU C library.  */
+ extern int getopt (int argc, char *const *argv, const char *shortopts);
+ #else /* not __GNU_LIBRARY__ */
+-extern int getopt ();
++/* extern int getopt (); */
+ #endif /* __GNU_LIBRARY__ */
+ extern int getopt_long (int argc, char *const *argv, const char *shortopts,
+ 		        const struct option *longopts, int *longind);
diff --git a/audio/mp3blaster/patches/patch-src_history_h b/audio/mp3blaster/patches/patch-src_history_h
deleted file mode 100644
index bc43aeb2ec0..00000000000
--- a/audio/mp3blaster/patches/patch-src_history_h
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_history_h,v 1.1 2002/07/20 20:15:05 naddy Exp $
---- src/history.h.orig	Sat Jul 20 19:28:11 2002
-+++ src/history.h	Sat Jul 20 19:28:19 2002
-@@ -21,7 +21,7 @@ public:
- 	const char *element();
- 
- private:
--	vector<char *> v;
-+	std::vector<char *> v;
- 	unsigned int curpos;
- 	std::vector<char *>::iterator it;
- };
diff --git a/audio/mp3blaster/patches/patch-src_main_cc b/audio/mp3blaster/patches/patch-src_main_cc
deleted file mode 100644
index e013a41eb3b..00000000000
--- a/audio/mp3blaster/patches/patch-src_main_cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_main_cc,v 1.1 2002/07/20 20:15:05 naddy Exp $
---- src/main.cc.orig	Sat Jul 20 21:48:51 2002
-+++ src/main.cc	Sat Jul 20 21:49:05 2002
-@@ -3945,7 +3945,7 @@ fw_search_next_char(char nxt)
- 
- /* called when someone presses '/' in filemanager */
- void
--fw_start_search(int timeout=2)
-+fw_start_search(int timeout)
- {
- 	signal(SIGALRM, &fw_search_timeout);
- 	fw_set_search_timeout(timeout);
diff --git a/audio/mp3blaster/pkg/PLIST b/audio/mp3blaster/pkg/PLIST
index bec4f1c853c..7bdf8f41973 100644
--- a/audio/mp3blaster/pkg/PLIST
+++ b/audio/mp3blaster/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2002/05/23 16:14:01 naddy Exp $
+@comment $OpenBSD: PLIST,v 1.3 2002/10/23 15:24:34 naddy Exp $
 bin/mp3blaster
 bin/mp3tag
 bin/nmixer
@@ -6,13 +6,14 @@ bin/splay
 man/man1/mp3blaster.1
 man/man1/nmixer.1
 man/man1/splay.1
-share/mp3blaster/README
-share/mp3blaster/chargen.c
+share/mp3blaster/charmap/README
+share/mp3blaster/charmap/chargen.c
+share/mp3blaster/charmap/koi8-r
+share/mp3blaster/charmap/makefile.charmap
+share/mp3blaster/charmap/maketbl.c
+share/mp3blaster/charmap/win1251
+share/mp3blaster/charmap/win2koi.tbl
 share/mp3blaster/commands.txt
-share/mp3blaster/koi8-r
-share/mp3blaster/makefile
-share/mp3blaster/maketbl.c
 share/mp3blaster/sample.mp3blasterrc
-share/mp3blaster/win1251
-share/mp3blaster/win2koi.tbl
+@dirrm share/mp3blaster/charmap
 @dirrm share/mp3blaster