diff --git a/net/samba/Makefile b/net/samba/Makefile
index bc259ec56975..0b2cbb44a70f 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	samba
-PORTVERSION=	2.2.11
-PORTREVISION=	1
+PORTVERSION=	2.2.12
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SAMBA}
 MASTER_SITE_SUBDIR=	. old-versions
@@ -113,7 +112,11 @@ CONFIGURE_ARGS+=	--with-utmp
 CONFIGURE_ARGS+=	--with-msdfs
 .endif
 
+.if defined(WITH_INCLUDED_POPT)
+CONFIGURE_ARGS+=	--with-included-popt
+.else
 LIB_DEPENDS+=	popt.0:${PORTSDIR}/devel/popt
+.endif
 
 .if defined(WITH_LDAP)
 USE_OPENLDAP=	yes
diff --git a/net/samba/distinfo b/net/samba/distinfo
index 7a2609c67555..3782df7af04c 100644
--- a/net/samba/distinfo
+++ b/net/samba/distinfo
@@ -1,5 +1,5 @@
-MD5 (samba-2.2.11.tar.gz) = 3aa08a4821fd1ba03b603ac2ff4bf071
-SIZE (samba-2.2.11.tar.gz) = 5503252
+MD5 (samba-2.2.12.tar.gz) = ffda6f5a93635d0b2afb2b2fb17e3bbf
+SIZE (samba-2.2.12.tar.gz) = 5459704
 MD5 (samba-2.2.10-freebsd-jail-patch-20040806.gz) = c38006077a83bb28ae7672df477834b2
 SIZE (samba-2.2.10-freebsd-jail-patch-20040806.gz) = 2959
 MD5 (samba-2.2.9-browsing-hacks.diff) = 39f95cdb2f9833b4eec7a05000fe2cbf