diff --git a/audio/nap/Makefile b/audio/nap/Makefile
index 1dce1041867..0def4e0d83e 100644
--- a/audio/nap/Makefile
+++ b/audio/nap/Makefile
@@ -1,10 +1,9 @@
-# $OpenBSD: Makefile,v 1.20 2003/02/02 04:02:08 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.21 2004/07/20 07:04:05 pvalchev Exp $
 
 COMMENT=	"gnu curses-based napster client"
 
-VERSION=	1.5.1
+VERSION=	1.5.3
 DISTNAME=	nap-${VERSION}
-PKGNAME=	${DISTNAME}p1
 CATEGORIES=    	audio
 
 HOMEPAGE=	http://nap.sourceforge.net/
diff --git a/audio/nap/distinfo b/audio/nap/distinfo
index 9c6604a4cc2..6797fcb4ad3 100644
--- a/audio/nap/distinfo
+++ b/audio/nap/distinfo
@@ -1,3 +1,3 @@
-MD5 (nap-1.5.1.tar.gz) = 554753d5d6154bdf5057156cc60d0658
-RMD160 (nap-1.5.1.tar.gz) = c254cc59c8911077d6fb479cf0aa1a6e29993907
-SHA1 (nap-1.5.1.tar.gz) = d8a8ed9f67f614058b49918a4a65d069b682794c
+MD5 (nap-1.5.3.tar.gz) = b39ceb2bac8432e1aef11b0d4ecf4c7c
+RMD160 (nap-1.5.3.tar.gz) = 6d86b212deee8d00d8215b9b54841803dd21a978
+SHA1 (nap-1.5.3.tar.gz) = c28c646e0430b971c202f57696e2bf65358116bb
diff --git a/audio/nap/patches/patch-doc_Makefile_in b/audio/nap/patches/patch-doc_Makefile_in
index 42c1adcbb91..882e6c37524 100644
--- a/audio/nap/patches/patch-doc_Makefile_in
+++ b/audio/nap/patches/patch-doc_Makefile_in
@@ -1,12 +1,12 @@
-$OpenBSD: patch-doc_Makefile_in,v 1.1 2003/02/02 04:02:09 pvalchev Exp $
---- doc/Makefile.in.orig	Sat Feb  1 20:49:36 2003
-+++ doc/Makefile.in	Sat Feb  1 20:49:46 2003
-@@ -65,7 +65,7 @@ VERSION = @VERSION@
- 
+$OpenBSD: patch-doc_Makefile_in,v 1.2 2004/07/20 07:04:05 pvalchev Exp $
+--- doc/Makefile.in.orig	Tue Jul 20 00:03:06 2004
++++ doc/Makefile.in	Tue Jul 20 00:03:21 2004
+@@ -124,7 +124,7 @@ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
  EXTRA_DIST = nap.1.in userguide.html napster.txt
- 
 -htmldir = $(prefix)/doc/nap
 +htmldir = $(prefix)/share/doc/nap
- 
  man_MANS = nap.1
  html_DATA = userguide.html
+ all: all-am
diff --git a/audio/nap/patches/patch-src_nap_c b/audio/nap/patches/patch-src_nap_c
deleted file mode 100644
index fc6e9c0e519..00000000000
--- a/audio/nap/patches/patch-src_nap_c
+++ /dev/null
@@ -1,40 +0,0 @@
-$OpenBSD: patch-src_nap_c,v 1.1 2003/12/29 20:23:55 espie Exp $
---- src/nap.c.orig	2003-12-29 20:34:48.000000000 +0100
-+++ src/nap.c	2003-12-29 20:35:21.000000000 +0100
-@@ -542,21 +542,21 @@ int set_defaults_interactive(char *fn) {
- 
-   if (!getval("connection")) {
-     if (!info.daemon) {
--      wp(NULL, "
--          Connection | Number
--          -------------------
--          Unknown    |  0
--          14.4       |  1
--          28.8       |  2
--          33.6       |  3
--          56.7       |  4
--          64K ISDN   |  5
--          128K ISDN  |  6
--          Cable      |  7
--          DSL        |  8
--          T1         |  9
--          T3 or >    | 10
--\n");
-+      wp(NULL, "\n"
-+"          Connection | Number\n"
-+"          -------------------\n"
-+"          Unknown    |  0\n"
-+"          14.4       |  1\n"
-+"          28.8       |  2\n"
-+"          33.6       |  3\n"
-+"          56.7       |  4\n"
-+"          64K ISDN   |  5\n"
-+"          128K ISDN  |  6\n"
-+"          Cable      |  7\n"
-+"          DSL        |  8\n"
-+"          T1         |  9\n"
-+"          T3 or >    | 10\n"
-+"\n");
-       wp(NULL, "How fast is your internet connection?\n");
-       wp(NULL, "Please choose 0--10 from the chart: [4] ");
-       ans = nap_getline(stdin);
diff --git a/audio/nap/patches/patch-src_title_h b/audio/nap/patches/patch-src_title_h
deleted file mode 100644
index 3ac2d3a3d4e..00000000000
--- a/audio/nap/patches/patch-src_title_h
+++ /dev/null
@@ -1,31 +0,0 @@
-$OpenBSD: patch-src_title_h,v 1.1 2003/12/29 20:23:55 espie Exp $
---- src/title.h.orig	2003-12-29 19:26:12.000000000 +0100
-+++ src/title.h	2003-12-29 19:26:58.000000000 +0100
-@@ -4,15 +4,15 @@
-  */
- 
- char title[] = 
--"     _.-------._
--    |\\          /|
--   /| \\_.----._/ |\\                                  __
--  .$:            :$.    _____  ____   _____  _____  / /__ ___   ____
-- |$$:  ___  ___  :$$|  / __  // _  `// _   //  ___//  __// _ \\ / ___/
--  \"$: \\___\\/___/ :$\"  / / / // /_/ // /_/ /(__   )/  /_ /  __// /
--    |     __     |   /_/ /_/ \\__,_// ____//_____/ \\___/ \\___//_/mG!
--    `.    \\/    .'                /_/
--      `. .__, .'
--        `----'
--
--";
-+"     _.-------._\n"
-+"    |\\          /|\n"
-+"   /| \\_.----._/ |\\                                  __\n"
-+"  .$:            :$.    _____  ____   _____  _____  / /__ ___   ____\n"
-+" |$$:  ___  ___  :$$|  / __  // _  `// _   //  ___//  __// _ \\ / ___/\n"
-+"  \"$: \\___\\/___/ :$\"  / / / // /_/ // /_/ /(__   )/  /_ /  __// /\n"
-+"    |     __     |   /_/ /_/ \\__,_// ____//_____/ \\___/ \\___//_/mG!\n"
-+"    `.    \\/    .'                /_/\n"
-+"      `. .__, .'\n"
-+"        `----'\n"
-+"\n"
-+"";