diff --git a/net/samba/Makefile b/net/samba/Makefile
index 7f5c30ad177..b79fa0dcbe2 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.109 2010/02/26 18:13:25 espie Exp $
+# $OpenBSD: Makefile,v 1.110 2010/03/05 09:01:45 giovanni Exp $
 
 COMMENT-main=	SMB and CIFS client and server for UNIX
 COMMENT-docs=	additional documentation and examples for Samba
 
 DISTNAME=		samba-3.0.37
-PKGNAME-main=		${DISTNAME}p0
+PKGNAME-main=		${DISTNAME}p1
 FULLPKGNAME-docs=	${DISTNAME:S/-/-docs-/}p0
 FULLPKGPATH-docs=	net/samba,-docs
 SHARED_LIBS=		smbclient	1.0 \
@@ -51,9 +51,6 @@ CONFIGURE_ARGS= --disable-fam \
 		--with-privatedir="${CONFDIR}" \
 		--with-libsmbclient \
 		--with-swatdir="${PREFIX}/share/swat" \
-		--with-ssl \
-		--with-sslinc="/usr/include/ssl" \
-		--with-ssllib="/usr/lib" \
 		--with-syslog \
 		--with-utmp
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
@@ -108,12 +105,26 @@ SAMBA_DOCS=${WRKSRC}/../README \
 
 SAMPLE_CONFIG=	${PREFIX}/share/examples/samba/smb.conf.default
 
+SAMBA_MANPAGES= ${WRKSRC}/../docs/manpages
+
 pre-configure:
 	@${SUBST_CMD} ${WRKSRC}/../docs/manpages/swat.8
 
+# Samba's man pages kill OpenBSD's groff/nroff/man implementation.
+# This workaround will be needed until the new usr.bin/mandoc is
+# finished and enabled.
 post-extract:
 	@cp ${FILESDIR}/krb5-config ${WRKDIR}/bin
 	@chmod a+x ${WRKDIR}/bin/krb5-config
+	@for file in ${SAMBA_MANPAGES}/*; do \
+         if [ -f $$file ]; then \
+	  cp $$file $$file.crap; \
+	  sed -e 's:\\FC::g' -e 's:\\F\[\]::g' -e 's:\.\\\":\ \\\":g' \
+	   -e 's:SH-xref:Sx:g' -e 's:\\m\[\]::g' -e 's:toupper:tu:g' \
+	   -e 's:\.\.\\\":\\\":g' -e 's:^.tu :\\":g' -e's:\\m\[blue\]::g' \
+	   -e's:\\m\[\]::g' $$file.crap  > $$file; \
+	 fi; \
+	done
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/samba/pdf
diff --git a/net/samba/patches/patch-docs_manpages_swat_8 b/net/samba/patches/patch-docs_manpages_swat_8
deleted file mode 100644
index 843594c4193..00000000000
--- a/net/samba/patches/patch-docs_manpages_swat_8
+++ /dev/null
@@ -1,80 +0,0 @@
-$OpenBSD: patch-docs_manpages_swat_8,v 1.7 2009/10/11 19:45:46 sthen Exp $
---- ../docs/manpages/swat.8.orig	Wed Sep 30 08:28:45 2009
-+++ ../docs/manpages/swat.8	Sat Oct 10 20:14:20 2009
-@@ -261,49 +261,6 @@ will be appended (e\&.g\&. log\&.smbclient, log\&.smbd
- .RS 4
- Print a summary of command line options\&.
- .RE
--.SH "INSTALLATION"
--.PP
--Swat is included as binary package with most distributions\&. The package manager in this case takes care of the installation and configuration\&. This section is only for those who have compiled swat from scratch\&.
--.PP
--After you compile SWAT you need to run
--\FCmake install \F[]
--to install the
--\FCswat\F[]
--binary and the various help files and images\&. A default install would put these in:
--.sp
--.RS 4
--.ie n \{\
--\h'-04'\(bu\h'+03'\c
--.\}
--.el \{\
--.sp -1
--.IP \(bu 2.3
--.\}
--/usr/local/samba/sbin/swat
--.RE
--.sp
--.RS 4
--.ie n \{\
--\h'-04'\(bu\h'+03'\c
--.\}
--.el \{\
--.sp -1
--.IP \(bu 2.3
--.\}
--/usr/local/samba/swat/images/*
--.RE
--.sp
--.RS 4
--.ie n \{\
--\h'-04'\(bu\h'+03'\c
--.\}
--.el \{\
--.sp -1
--.IP \(bu 2.3
--.\}
--/usr/local/samba/swat/help/*
--.sp
--.RE
- .SS "Inetd Installation"
- .PP
- You need to edit your
-@@ -331,7 +288,7 @@ In
- \FC/etc/inetd\&.conf\F[]
- you should add a line like this:
- .PP
--\FCswat stream tcp nowait\&.400 root /usr/local/samba/sbin/swat swat\F[]
-+\FCswat stream tcp nowait\&.400 root ${PREFIX}/libexec/swat swat\F[]
- .PP
- Once you have edited
- \FC/etc/services\F[]
-@@ -357,14 +314,12 @@ This file must contain suitable startup information fo
- This file must contain a mapping of service name (e\&.g\&., swat) to service port (e\&.g\&., 901) and protocol type (e\&.g\&., tcp)\&.
- .RE
- .PP
--\FC/usr/local/samba/lib/smb\&.conf\F[]
-+\FC${SYSCONFDIR}/samba/smb\&.conf\F[]
- .RS 4
- This is the default location of the
- \fBsmb.conf\fR(5)
--server configuration file that swat edits\&. Other common places that systems install this file are
--\FC /usr/samba/lib/smb\&.conf\F[]
--and
--\FC/etc/smb\&.conf \F[]\&. This file describes all the services the server is to make available to clients\&.
-+server configuration file that swat edits\&.
-+This file describes all the services the server is to make available to clients\&.
- .RE
- .SH "WARNINGS"
- .PP
diff --git a/net/samba/pkg/PLIST-main b/net/samba/pkg/PLIST-main
index f164e946326..c14dcb5806f 100644
--- a/net/samba/pkg/PLIST-main
+++ b/net/samba/pkg/PLIST-main
@@ -1,29 +1,29 @@
-@comment $OpenBSD: PLIST-main,v 1.10 2009/10/11 19:45:46 sthen Exp $
+@comment $OpenBSD: PLIST-main,v 1.11 2010/03/05 09:01:45 giovanni Exp $
 @conflict samba-docs-<=3.0.31p1
 @pkgpath ${BASE_PKGPATH}
-bin/eventlogadm
+@bin bin/eventlogadm
 bin/findsmb
 bin/mksmbpasswd
-bin/net
-bin/nmblookup
-bin/ntlm_auth
-bin/pdbedit
-bin/profiles
-bin/rpcclient
-bin/smbcacls
-bin/smbclient
-bin/smbcontrol
-bin/smbcquotas
-bin/smbget
-bin/smbpasswd
-bin/smbspool
-bin/smbstatus
+@bin bin/net
+@bin bin/nmblookup
+@bin bin/ntlm_auth
+@bin bin/pdbedit
+@bin bin/profiles
+@bin bin/rpcclient
+@bin bin/smbcacls
+@bin bin/smbclient
+@bin bin/smbcontrol
+@bin bin/smbcquotas
+@bin bin/smbget
+@bin bin/smbpasswd
+@bin bin/smbspool
+@bin bin/smbstatus
 bin/smbtar
-bin/smbtree
-bin/tdbbackup
-bin/tdbdump
-bin/tdbtool
-bin/testparm
+@bin bin/smbtree
+@bin bin/tdbbackup
+@bin bin/tdbdump
+@bin bin/tdbtool
+@bin bin/testparm
 include/libmsrpc.h
 include/libsmbclient.h
 lib/samba/
@@ -44,9 +44,9 @@ lib/samba/rpc/
 lib/samba/tr.msg
 lib/samba/upcase.dat
 lib/samba/valid.dat
-libexec/nmbd
-libexec/smbd
-libexec/swat
+@bin libexec/nmbd
+@bin libexec/smbd
+@bin libexec/swat
 @man man/man1/findsmb.1
 @man man/man1/log2pcap.1
 @man man/man1/nmblookup.1