diff --git a/net/samba/Makefile b/net/samba/Makefile
index 0b599e729dc..3aee1a58e47 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.94 2008/07/25 22:01:17 brad Exp $
+# $OpenBSD: Makefile,v 1.95 2008/08/29 19:50:20 mbalmer Exp $
 
 COMMENT-main=	SMB and CIFS client and server for UNIX
 COMMENT-docs=	documentation and examples for samba
 
 DISTNAME=		samba-3.0.31
 PKGNAME-main=		${DISTNAME}
-FULLPKGNAME-docs=	${DISTNAME:S/-/-docs-/}
+FULLPKGNAME-docs=	${DISTNAME:S/-/-docs-/}p0
 SHARED_LIBS=		smbclient	1.0 \
 			msrpc		1.0
 
diff --git a/net/samba/files/README.OpenBSD b/net/samba/files/README.OpenBSD
index 878845edbd1..bd1286c5732 100644
--- a/net/samba/files/README.OpenBSD
+++ b/net/samba/files/README.OpenBSD
@@ -1,17 +1,17 @@
 Using samba package in an OpenBSD environment:
 
-1. Edit ${SYSCONDIR}/samba/smb.conf to suit your needs.
+1. Edit ${SYSCONFDIR}/samba/smb.conf to suit your needs.
 
-2. Edit ${SYSCONDIR}/rc.conf.local:
+2. Edit ${SYSCONFDIR}/rc.conf.local:
    ...
    smbd_flags="-D"         # for normal use: "-D"
    nmbd_flags="-D"         # for normal use: "-D"
    ...
 
-3. Edit ${SYSCONDIR}/rc.local:
+3. Edit ${SYSCONFDIR}/rc.local:
    echo -n 'starting local daemons:'
    ...
-   if [ -f ${SYSCONDIR}/samba/smb.conf ]; then
+   if [ -f ${SYSCONFDIR}/samba/smb.conf ]; then
        if [ X"${smbd_flags}" != X"NO" -a -x /usr/local/libexec/smbd ]; then
            echo -n ' smbd';    /usr/local/libexec/smbd ${smbd_flags}
        fi
@@ -28,13 +28,13 @@ with swat over a network is inadvisable as passwords are passed in
 the clear. You can avoid this problem by using ssh forwarding to
 port 901.
 
-4. add the following entry to ${SYSCONDIR}/inetd.conf:
+4. add the following entry to ${SYSCONFDIR}/inetd.conf:
 
    ...
    swat  stream  tcp  nowait.400  root  /usr/local/libexec/swat  swat
    ...
 
-5. add the following entry to ${SYSCONDIR}/services:
+5. add the following entry to ${SYSCONFDIR}/services:
 
    ...
    swat            901/tcp                 # samba admin service