diff --git a/net/samba/Makefile b/net/samba/Makefile
index 1d3ea4cc8a6..0a31f8901b0 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -3,11 +3,11 @@
 # Date created:				22 Apr 1998
 # Whom:					form
 #
-# $OpenBSD: Makefile,v 1.8 1998/05/11 03:29:11 form Exp $
+# $OpenBSD: Makefile,v 1.9 1998/05/12 05:14:58 form Exp $
 #
 
-DISTNAME=	samba-1.9.18p5
-PKGNAME=	samba-1.9.18.5
+DISTNAME=	samba-1.9.18p6
+PKGNAME=	samba-1.9.18.6
 CATEGORIES=	net
 MASTER_SITES=	ftp://samba.anu.edu.au/pub/samba/
 
diff --git a/net/samba/files/md5 b/net/samba/files/md5
index 1a546231c81..f29ae54eaba 100644
--- a/net/samba/files/md5
+++ b/net/samba/files/md5
@@ -1 +1 @@
-MD5 (samba-1.9.18p5.tar.gz) = aaceb02f2f7677bc5ae48d2d09732c70
+MD5 (samba-1.9.18p6.tar.gz) = 630b9de2805133d460036bb2a970997b
diff --git a/net/samba/patches/patch-aa b/net/samba/patches/patch-aa
index e256974912e..ef600a6aa6b 100644
--- a/net/samba/patches/patch-aa
+++ b/net/samba/patches/patch-aa
@@ -1,5 +1,5 @@
-*** Makefile.orig	Sat Mar 28 05:59:09 1998
---- Makefile	Wed Apr 22 13:19:36 1998
+*** Makefile.orig	Mon May 11 15:37:44 1998
+--- Makefile	Mon May 11 20:15:46 1998
 ***************
 *** 5,11 ****
   ###########################################################################
@@ -108,7 +108,7 @@
   # set this to the name of the default account, which is the one
   # to use when no username or password is specified.  This can be overridden
 ***************
-*** 429,436 ****
+*** 430,437 ****
   
   # This is for OpenBSD
   # contributed by todd@openbsd.org
@@ -117,7 +117,7 @@
   
   # This is for NEXTSTEP Release 2.X
   # No Posix.
---- 430,437 ----
+--- 431,438 ----
   
   # This is for OpenBSD
   # contributed by todd@openbsd.org
@@ -127,7 +127,24 @@
   # This is for NEXTSTEP Release 2.X
   # No Posix.
 ***************
-*** 823,830 ****
+*** 755,761 ****
+  
+  smbd: $(SMBDOBJ) $(ARCFOUR_OBJ)
+  	@echo Linking smbd
+! 	@$(CC) $(CFLAGS) -o smbd $(SMBDOBJ) $(ARCFOUR_OBJ) $(LIBS) $(AFS_LIBS)
+  
+  smbrun: smbrun.o 
+  	@echo Linking smbrun
+--- 756,762 ----
+  
+  smbd: $(SMBDOBJ) $(ARCFOUR_OBJ)
+  	@echo Linking smbd
+! 	@$(CC) $(CFLAGS) -o smbd $(SMBDOBJ) $(ARCFOUR_OBJ) $(LIBS) $(LIBSM) $(AFS_LIBS)
+  
+  smbrun: smbrun.o 
+  	@echo Linking smbrun
+***************
+*** 824,831 ****
   install: installbin installman installscripts installcp
   
   installbin: all
@@ -136,7 +153,7 @@
   
   installscripts:
   	@$(SHELL) $(srcdir)installscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
---- 824,831 ----
+--- 825,832 ----
   install: installbin installman installscripts installcp
   
   installbin: all
@@ -146,7 +163,7 @@
   installscripts:
   	@$(SHELL) $(srcdir)installscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
 ***************
-*** 846,853 ****
+*** 847,854 ****
   	@$(SHELL) $(srcdir)uninstallman.sh $(MANDIR) $(srcdir)
   
   uninstallbin:
@@ -155,7 +172,7 @@
   
   uninstallscripts:
   	@$(SHELL) $(srcdir)uninstallscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
---- 847,854 ----
+--- 848,855 ----
   	@$(SHELL) $(srcdir)uninstallman.sh $(MANDIR) $(srcdir)
   
   uninstallbin:
diff --git a/net/samba/patches/patch-ab b/net/samba/patches/patch-ab
index 798bc059439..40f186268a2 100644
--- a/net/samba/patches/patch-ab
+++ b/net/samba/patches/patch-ab
@@ -1,14 +1,29 @@
-*** includes.h.orig	Tue Apr 21 17:30:18 1998
---- includes.h	Tue Apr 21 17:39:57 1998
+*** includes.h.orig	Mon May 11 15:37:45 1998
+--- includes.h	Tue May 12 11:41:46 1998
 ***************
-*** 554,559 ****
---- 554,562 ----
-  #define HAVE_MEMMOVE
-  #define USE_GETCWD
-  #define USE_SETSID
+*** 503,510 ****
+  #define USE_DIRECT
+  #endif
+  
+  
+! #ifdef NETBSD 
+  #ifdef NetBSD1_3
+  #include <string.h>
+  #ifdef ALLOW_CHANGE_PASSWORD
+--- 503,518 ----
+  #define USE_DIRECT
+  #endif
+  
++ #ifdef __OpenBSD__
++ #ifndef QSORT_CAST
++ #define QSORT_CAST (int (*)(const void *, const void *))
++ #endif /* QSORT_CAST */
 + #ifdef ALLOW_CHANGE_PASSWORD
 + #include <termios.h>
-+ #endif
-  #endif 
++ #endif /* ALLOW_CHANGE_PASSWORD) */
++ #endif /* __OpenBSD__ */
   
-  #ifdef AIX
+! #ifdef NETBSD
+  #ifdef NetBSD1_3
+  #include <string.h>
+  #ifdef ALLOW_CHANGE_PASSWORD
diff --git a/net/samba/patches/patch-ae b/net/samba/patches/patch-ae
new file mode 100644
index 00000000000..d68c4a335a8
--- /dev/null
+++ b/net/samba/patches/patch-ae
@@ -0,0 +1,19 @@
+*** slprintf.c.orig	Tue May 12 11:03:20 1998
+--- slprintf.c	Tue May 12 11:06:29 1998
+***************
+*** 45,51 ****
+  		/* note: we don't free the old memory (if any) as we don't 
+  		   want a malloc lib to reuse the memory as it will
+  		   have the wrong permissions */
+! 		buf = memalign(pagesize, len);
+  		if (buf) {
+  			if (mprotect(buf+(len-pagesize), pagesize, PROT_READ) != 0) {
+  				exit(1);
+--- 45,51 ----
+  		/* note: we don't free the old memory (if any) as we don't 
+  		   want a malloc lib to reuse the memory as it will
+  		   have the wrong permissions */
+! 		buf = malloc(len);
+  		if (buf) {
+  			if (mprotect(buf+(len-pagesize), pagesize, PROT_READ) != 0) {
+  				exit(1);
diff --git a/net/samba/pkg/PLIST b/net/samba/pkg/PLIST
index aff051ab092..d73ad7ea96d 100644
--- a/net/samba/pkg/PLIST
+++ b/net/samba/pkg/PLIST
@@ -11,11 +11,14 @@ bin/testparm
 bin/testprns
 sbin/nmbd
 sbin/smbd
-lib/codepages/codepage.437
-lib/codepages/codepage.850
-lib/codepages/codepage.852
-lib/codepages/codepage.866
-lib/codepages/codepage.932
+lib/samba/codepages/codepage.437
+lib/samba/codepages/codepage.850
+lib/samba/codepages/codepage.852
+lib/samba/codepages/codepage.866
+lib/samba/codepages/codepage.932
+lib/samba/codepages/codepage.936
+lib/samba/codepages/codepage.949
+lib/samba/codepages/codepage.950
 man/man1/make_smbcodepage.1
 man/man1/smbclient.1
 man/man1/smbrun.1
@@ -31,30 +34,38 @@ man/man8/smbmnt.8
 man/man8/smbmount.8
 man/man8/smbpasswd.8
 man/man8/smbumount.8
-share/doc/html/samba/Samba-Server-FAQ-1.html
-share/doc/html/samba/Samba-Server-FAQ-2.html
-share/doc/html/samba/Samba-Server-FAQ.html
-share/doc/html/samba/Samba-Server-FAQ.sgml
-share/doc/html/samba/Samba-meta-FAQ-1.html
-share/doc/html/samba/Samba-meta-FAQ-2.html
-share/doc/html/samba/Samba-meta-FAQ-3.html
-share/doc/html/samba/Samba-meta-FAQ-4.html
-share/doc/html/samba/Samba-meta-FAQ-5.html
-share/doc/html/samba/Samba-meta-FAQ-6.html
-share/doc/html/samba/Samba-meta-FAQ.html
-share/doc/html/samba/Samba-meta-FAQ.sgml
-share/doc/html/samba/Samba-meta-FAQ.txt
-share/doc/html/samba/sambafaq-1.html
-share/doc/html/samba/sambafaq-2.html
-share/doc/html/samba/sambafaq-3.html
-share/doc/html/samba/sambafaq-4.html
-share/doc/html/samba/sambafaq-5.html
-share/doc/html/samba/sambafaq.html
-share/doc/html/samba/sambafaq.sgml
+share/doc/samba/faq/Samba-Server-FAQ-1.html
+share/doc/samba/faq/Samba-Server-FAQ-2.html
+share/doc/samba/faq/Samba-Server-FAQ.html
+share/doc/samba/faq/Samba-Server-FAQ.sgml
+share/doc/samba/faq/Samba-meta-FAQ-1.html
+share/doc/samba/faq/Samba-meta-FAQ-2.html
+share/doc/samba/faq/Samba-meta-FAQ-3.html
+share/doc/samba/faq/Samba-meta-FAQ-4.html
+share/doc/samba/faq/Samba-meta-FAQ-5.html
+share/doc/samba/faq/Samba-meta-FAQ-6.html
+share/doc/samba/faq/Samba-meta-FAQ.html
+share/doc/samba/faq/Samba-meta-FAQ.sgml
+share/doc/samba/faq/Samba-meta-FAQ.txt
+share/doc/samba/faq/sambafaq-1.html
+share/doc/samba/faq/sambafaq-2.html
+share/doc/samba/faq/sambafaq-3.html
+share/doc/samba/faq/sambafaq-4.html
+share/doc/samba/faq/sambafaq-5.html
+share/doc/samba/faq/sambafaq.html
+share/doc/samba/faq/sambafaq.sgml
+share/doc/samba/faq/sambafaq.txt
+share/doc/samba/README.OpenBSD
+share/doc/samba/INSTALL.sambatar
+share/doc/samba/THANKS
+share/doc/samba/history
+share/doc/samba/announce
+share/doc/samba/PROJECTS
 share/doc/samba/Application_Serving.txt
 share/doc/samba/BROWSING.txt
 share/doc/samba/BUGS.txt
 share/doc/samba/CVS_ACCESS.txt
+share/doc/samba/DHCP-Server-Configuration.txt
 share/doc/samba/DIAGNOSIS.txt
 share/doc/samba/DNIX.txt
 share/doc/samba/DOMAIN.txt
@@ -63,44 +74,40 @@ share/doc/samba/ENCRYPTION.txt
 share/doc/samba/Faxing.txt
 share/doc/samba/GOTCHAS.txt
 share/doc/samba/HINTS.txt
-share/doc/samba/INSTALL.sambatar
 share/doc/samba/MIRRORS.txt
-share/doc/samba/NT4_PlainPassword.reg
+share/doc/samba/SCO.txt
 share/doc/samba/NTDOMAIN.txt
 share/doc/samba/NetBIOS.txt
 share/doc/samba/OS2-Client-HOWTO.txt
 share/doc/samba/PRINTER_DRIVER.txt
-share/doc/samba/PROJECTS
+share/doc/samba/PROFILES.txt
 share/doc/samba/Passwords.txt
 share/doc/samba/Printing.txt
-share/doc/samba/README.DCEDFS
-share/doc/samba/README.jis
-share/doc/samba/README.sambatar
-share/doc/samba/SCO.txt
-share/doc/samba/SMBTAR.notes
 share/doc/samba/Speed.txt
+share/doc/samba/Speed2.txt
 share/doc/samba/Support.txt
-share/doc/samba/THANKS
 share/doc/samba/Tracing.txt
 share/doc/samba/UNIX-SMB.txt
 share/doc/samba/UNIX_INSTALL.txt
 share/doc/samba/Win95.txt
-share/doc/samba/Win95_PlainPassword.reg
 share/doc/samba/WinNT.txt
-share/doc/samba/announce
 share/doc/samba/cifsntdomain.txt
-share/doc/samba/history
-share/doc/samba/samba.lsm
 share/doc/samba/security_level.txt
+share/doc/samba/NT4_PlainPassword.reg
+share/doc/samba/Win95_PlainPassword.reg
 share/doc/samba/wfw_slip.htm
-share/doc/samba/sambafaq.txt
-@dirrm lib/codepages
-@dirrm share/doc/html/samba
+share/doc/samba/README
+share/doc/samba/WHATSNEW.txt
+share/doc/samba/README.DCEDFS
+share/doc/samba/README.jis
+share/doc/samba/README.sambatar
+@dirrm share/doc/samba/faq
 @dirrm share/doc/samba
-@unexec echo ""
-@unexec echo "*** Remove these files (if they exist)"
-@unexec echo "***	/etc/smb.conf"
-@unexec echo "***	/etc/lmhosts"
-@unexec echo "***	/etc/smbpasswd"
-@unexec echo "*** if you wish to completely delete samba from your system."
-@unexec echo ""
+@dirrm lib/samba/codepages
+@dirrm lib/samba
+@exec if [ ! -f /etc/samba/smbpasswd ]; then /bin/cat /etc/passwd | %D/bin/mksmbpasswd.sh > /etc/samba/smbpasswd; chown root.wheel /etc/samba/smbpasswd; chmod 600 /etc/samba/smbpasswd; fi
+@exec more %D/share/doc/samba/README.OpenBSD
+@unexec echo "***"
+@unexec echo "*** Remove /etc/samba directory and it's contents manually"
+@unexec echo "*** if you won't install samba again."
+@unexec echo "***"