diff --git a/net/samba/Makefile b/net/samba/Makefile
index 82f2a217d32..2adadb6fc77 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.104 2009/05/22 14:06:13 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.105 2009/06/30 21:38:38 naddy Exp $
 
 COMMENT-main=	SMB and CIFS client and server for UNIX
 COMMENT-docs=	additional documentation and examples for Samba
 
 DISTNAME=		samba-3.0.34
-PKGNAME-main=		${DISTNAME}p0
+PKGNAME-main=		${DISTNAME}p1
 FULLPKGNAME-docs=	${DISTNAME:S/-/-docs-/}
 SHARED_LIBS=		smbclient	1.0 \
 			msrpc		1.0
diff --git a/net/samba/patches/patch-smbd_posix_acls_c b/net/samba/patches/patch-smbd_posix_acls_c
new file mode 100644
index 00000000000..696e9c7a561
--- /dev/null
+++ b/net/samba/patches/patch-smbd_posix_acls_c
@@ -0,0 +1,15 @@
+$OpenBSD: patch-smbd_posix_acls_c,v 1.1 2009/06/30 21:38:38 naddy Exp $
+
+Resolve CVE-2009-1888
+
+--- smbd/posix_acls.c.orig	Tue Nov 18 10:37:41 2008
++++ smbd/posix_acls.c	Mon Jun 29 19:14:43 2009
+@@ -2296,6 +2296,8 @@ static BOOL acl_group_override(connection_struct *conn
+ {
+ 	SMB_STRUCT_STAT sbuf;
+ 
++	ZERO_STRUCT(sbuf);
++
+ 	if ((errno != EPERM) && (errno != EACCES)) {
+ 		return False;
+ 	}