diff --git a/net/samba32/Makefile b/net/samba32/Makefile
index 143a9b3b80fe..3d592a3969bc 100644
--- a/net/samba32/Makefile
+++ b/net/samba32/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		samba
-PORTVERSION?=		3.2.8
+PORTVERSION?=		3.2.10
 CATEGORIES?=		net
 MASTER_SITES=		${MASTER_SITE_SAMBA}
 MASTER_SITE_SUBDIR=	. old-versions rc pre
@@ -97,7 +97,7 @@ CONFIGURE_ARGS+=	--with-pam --with-readline --with-included-iniparser \
 			--without-libaddns
 # Sanity checks
 .if exists(${LOCALBASE}/include/tdb.h)
-IGNORE=			doesn't compile when tdb is installed. Uninstall databases/tdb port
+#IGNORE=			doesn't compile when tdb is installed. Uninstall databases/tdb port
 .endif
 # Let process generate meaningful backtrace on a core dump
 LIB_DEPENDS+=		execinfo.1:${PORTSDIR}/devel/libexecinfo
@@ -456,7 +456,7 @@ post-install:
 
 .if defined(WITH_MAX_DEBUG)
 test:
-	cd ${WRKSRC} && ${MAKE} test
+	(cd ${WRKSRC} && ${MAKE} test_nss_modules test_pam_modules && ${MAKE} test)
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/net/samba32/distinfo b/net/samba32/distinfo
index d4486b38b60e..8de75ada1363 100644
--- a/net/samba32/distinfo
+++ b/net/samba32/distinfo
@@ -1,3 +1,3 @@
-MD5 (samba-3.2.8.tar.gz) = 06efd6e6cc4aac628a1a0b082e4be0f2
-SHA256 (samba-3.2.8.tar.gz) = 7e7fb53d6ff05993dcb8b871e3c3016bd4d161d72ded8f8760a4439e9d76aa3b
-SIZE (samba-3.2.8.tar.gz) = 24292385
+MD5 (samba-3.2.10.tar.gz) = 7a83207fb05200e9c2114d995f11396e
+SHA256 (samba-3.2.10.tar.gz) = 9545135c6fde96864f676526361309bd9723727226d234b06ad02d3b672babec
+SIZE (samba-3.2.10.tar.gz) = 24397084
diff --git a/net/samba32/files/patch-include__includes.h b/net/samba32/files/patch-include__includes.h
deleted file mode 100644
index 398db821c136..000000000000
--- a/net/samba32/files/patch-include__includes.h
+++ /dev/null
@@ -1,16 +0,0 @@
---- ./include/includes.h.orig	2008-12-19 13:57:33.000000000 +0000
-+++ ./include/includes.h	2009-01-06 17:10:53.000000000 +0000
-@@ -207,10 +207,10 @@
- #undef HAVE_LDAP
- #endif
- 
--#if HAVE_GSSAPI_H
--#include <gssapi.h>
--#elif HAVE_GSSAPI_GSSAPI_H
-+#if HAVE_GSSAPI_GSSAPI_H
- #include <gssapi/gssapi.h>
-+#elif HAVE_GSSAPI_H
-+#include <gssapi.h>
- #elif HAVE_GSSAPI_GSSAPI_GENERIC_H
- #include <gssapi/gssapi_generic.h>
- #endif
diff --git a/net/samba32/files/patch-lib__replace__libnetwork.m4 b/net/samba32/files/patch-lib__replace__libnetwork.m4
deleted file mode 100644
index a87b87beb3c2..000000000000
--- a/net/samba32/files/patch-lib__replace__libnetwork.m4
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/replace/libreplace_network.m4.orig	2009-02-20 17:12:18.000000000 +0000
-+++ lib/replace/libreplace_network.m4	2009-02-20 17:14:31.000000000 +0000
-@@ -353,6 +353,7 @@
- #include <sys/socket.h>
- #include <sys/types.h>
- #include <netdb.h>
-+#include <netinet/in.h>
- 		],
- 		[
- struct sockaddr_storage sa_store;
diff --git a/net/samba32/files/patch-libaddns__dns.h b/net/samba32/files/patch-libaddns__dns.h
deleted file mode 100644
index 93f66b47be8f..000000000000
--- a/net/samba32/files/patch-libaddns__dns.h
+++ /dev/null
@@ -1,19 +0,0 @@
---- ./libaddns/dns.h.orig	2008-12-19 13:57:33.000000000 +0000
-+++ ./libaddns/dns.h	2009-01-06 17:10:53.000000000 +0000
-@@ -81,12 +81,12 @@
- #include <krb5.h>
- #endif
- 
--#if HAVE_GSSAPI_H
--#include <gssapi.h>
-+#if HAVE_GSSAPI_GSSAPI_GENERIC_H
-+#include <gssapi/gssapi_generic.h>
- #elif HAVE_GSSAPI_GSSAPI_H
- #include <gssapi/gssapi.h>
--#elif HAVE_GSSAPI_GSSAPI_GENERIC_H
--#include <gssapi/gssapi_generic.h>
-+#elif HAVE_GSSAPI_H
-+#include <gssapi.h>
- #endif
- 
- #if defined(HAVE_GSSAPI_H) || defined(HAVE_GSSAPI_GSSAPI_H) || defined(HAVE_GSSAPI_GSSAPI_GENERIC_H)