diff --git a/net/samba-devel/Makefile b/net/samba-devel/Makefile
index 6ebbf6f6d140..1d1b16ea867e 100644
--- a/net/samba-devel/Makefile
+++ b/net/samba-devel/Makefile
@@ -6,18 +6,22 @@
 #
 
 PORTNAME=	samba
-PORTVERSION=	2.2.0
+PORTVERSION=	2.2.0a3
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.samba.org/pub/samba/%SUBDIR%/ \
 		ftp://samba.anu.edu.au/pub/samba/%SUBDIR%/ \
 		ftp://de.samba.org/pub/mirror/samba/%SUBDIR%/ \
 		ftp://se.samba.org/pub/samba/%SUBDIR%/ \
 		ftp://ftp.sunet.se/pub/unix/utilities/samba/%SUBDIR%/
-MASTER_SITE_SUBDIR= . old alpha
-DISTNAME=       samba-${PORTVERSION}
+MASTER_SITE_SUBDIR= alpha
+DISTNAME=       samba-2.2.0-alpha3
 
 MAINTAINER=	dwcjr@inethouston.net
 
+FORBIDDEN=	security problem
+
+NO_LATEST_LINK=	"Unstable, development version."
+
 # directories
 VARDIR=		/var
 SAMBA_SPOOL=	${VARDIR}/spool/samba
diff --git a/net/samba/Makefile b/net/samba/Makefile
index bb44defcbee0..9dda6fa361c3 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -6,18 +6,19 @@
 #
 
 PORTNAME=	samba
-PORTVERSION=	2.0.8
+PORTVERSION=	2.0.7
 CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.samba.org/pub/samba/%SUBDIR%/ \
-		ftp://ring.asahi-net.or.jp/pub/net/samba/%SUBDIR%/ \
-		ftp://samba.anu.edu.au/pub/samba/%SUBDIR%/ \
-		ftp://de.samba.org/pub/mirror/samba/%SUBDIR%/ \
-		ftp://se.samba.org/pub/samba/%SUBDIR%/ \
-		ftp://ftp.sunet.se/pub/unix/utilities/samba/%SUBDIR%/
-MASTER_SITE_SUBDIR= . old
+MASTER_SITES=	ftp://ftp.samba.org/pub/samba/ \
+		ftp://ring.asahi-net.or.jp/pub/net/samba/ \
+		ftp://samba.anu.edu.au/pub/samba/ \
+		ftp://de.samba.org/pub/mirror/samba/ \
+		ftp://se.samba.org/pub/samba/ \
+		ftp://ftp.sunet.se/pub/unix/utilities/samba/
 
 MAINTAINER=	dwcjr@inethouston.net
 
+FORBIDDEN=	security problem
+
 # directories
 VARDIR=		/var
 SAMBA_SPOOL=	${VARDIR}/spool/samba
diff --git a/net/samba3/Makefile b/net/samba3/Makefile
index 6ebbf6f6d140..1d1b16ea867e 100644
--- a/net/samba3/Makefile
+++ b/net/samba3/Makefile
@@ -6,18 +6,22 @@
 #
 
 PORTNAME=	samba
-PORTVERSION=	2.2.0
+PORTVERSION=	2.2.0a3
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.samba.org/pub/samba/%SUBDIR%/ \
 		ftp://samba.anu.edu.au/pub/samba/%SUBDIR%/ \
 		ftp://de.samba.org/pub/mirror/samba/%SUBDIR%/ \
 		ftp://se.samba.org/pub/samba/%SUBDIR%/ \
 		ftp://ftp.sunet.se/pub/unix/utilities/samba/%SUBDIR%/
-MASTER_SITE_SUBDIR= . old alpha
-DISTNAME=       samba-${PORTVERSION}
+MASTER_SITE_SUBDIR= alpha
+DISTNAME=       samba-2.2.0-alpha3
 
 MAINTAINER=	dwcjr@inethouston.net
 
+FORBIDDEN=	security problem
+
+NO_LATEST_LINK=	"Unstable, development version."
+
 # directories
 VARDIR=		/var
 SAMBA_SPOOL=	${VARDIR}/spool/samba