diff --git a/security/nbaudit/patches/patch-aa b/security/nbaudit/patches/patch-Makefile
similarity index 100%
rename from security/nbaudit/patches/patch-aa
rename to security/nbaudit/patches/patch-Makefile
diff --git a/security/nbaudit/patches/patch-client.c b/security/nbaudit/patches/patch-client.c
new file mode 100644
index 00000000000..1e9ed1a328c
--- /dev/null
+++ b/security/nbaudit/patches/patch-client.c
@@ -0,0 +1,28 @@
+# patch from palante@subterrain.net
+
+--- client.c.orig	Tue Jul 11 16:01:35 2000
++++ client.c	Tue Jul 11 16:03:20 2000
+@@ -3612,8 +3612,9 @@ phase_3:				/* smb session setup/auth */
+   done = 0;
+   username[0] = '\0';
+   while (!done) {
+-    if (!userfd || !passfd)
+-       uppair();
++    if (!userfd || !passfd) {
++			if (!uppair()) done++;
++		}
+     else {
+        if (fgets(password, sizeof(password), passfd) == NULL) {
+           rewind(passfd);
+@@ -3635,8 +3636,9 @@ phase_3:				/* smb session setup/auth */
+        }
+     }
+ 
+-    if ((! *username) && (! *password))
+-      uppair();				/* sleaze for NT */
++    if ((! *username) && (! *password)) {
++			if (!uppair()) done++;
++		}
+ 
+ #ifdef VERBOSE
+   natprintf("[*]--- Attempting to connect with Username: `%s' Password: `%s'\n",
diff --git a/security/nbaudit/patches/patch-ab b/security/nbaudit/patches/patch-nat.1
similarity index 100%
rename from security/nbaudit/patches/patch-ab
rename to security/nbaudit/patches/patch-nat.1
diff --git a/security/nbaudit/pkg/PLIST b/security/nbaudit/pkg/PLIST
index a664577e52c..28182eaa86f 100644
--- a/security/nbaudit/pkg/PLIST
+++ b/security/nbaudit/pkg/PLIST
@@ -1,2 +1,3 @@
+@comment $OpenBSD: PLIST,v 1.2 2000/09/18 08:51:32 obecian Exp $
 bin/nbaudit
 man/man1/nbaudit.1