diff --git a/net/samba36/Makefile b/net/samba36/Makefile
index 426a77d34be0..173cf374055e 100644
--- a/net/samba36/Makefile
+++ b/net/samba36/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=		${SAMBA_BASENAME}36
 PORTVERSION=		3.6.20
-PORTREVISION?=		0
+PORTREVISION?=		1
 CATEGORIES?=		net
 MASTER_SITES=		${MASTER_SITE_SAMBA}
 MASTER_SITE_SUBDIR=	samba samba/stable samba/pre
diff --git a/net/samba36/files/samba.in b/net/samba36/files/samba.in
index 77759040b5ec..98c2ca75a3d7 100644
--- a/net/samba36/files/samba.in
+++ b/net/samba36/files/samba.in
@@ -164,6 +164,11 @@ samba_config_init() {
     fi
     # Defaults
     samba_enable=${samba_enable:=NO}
+    # Setup dependent variables
+    if [ -n "${rcvar}" ] && checkyesno "${rcvar}"; then
+	nmbd_enable=${nmbd_enable=YES}
+	smbd_enable=${smbd_enable=YES}
+    fi
     nmbd_enable=${nmbd_enable:=NO}
     smbd_enable=${smbd_enable:=NO}
 %%WINBIND%%    # Winbindd
@@ -175,11 +180,6 @@ samba_config_init() {
 %%WINBIND%%	fi
 %%WINBIND%%	winbindd_enable=${winbindd_enable:=NO}
 %%WINBIND%%    fi
-    # Setup dependent variables
-    if [ -n "${rcvar}" ] && checkyesno "${rcvar}"; then
-	nmbd_enable=${nmbd_enable=YES}
-	smbd_enable=${smbd_enable=YES}
-    fi
 }
 
 # Load configuration variables