diff --git a/net/samba36/patches/130-remove_services.patch b/net/samba36/patches/130-remove_services.patch
index 5b873a3e9..706048c16 100644
--- a/net/samba36/patches/130-remove_services.patch
+++ b/net/samba36/patches/130-remove_services.patch
@@ -82,3 +82,17 @@
  #ifdef PRINTER_SUPPORT
  		rpc_spoolss_shutdown();
  #endif
+--- a/source3/rpcclient/rpcclient.c
++++ b/source3/rpcclient/rpcclient.c
+@@ -635,9 +635,11 @@ static struct cmd_set *rpcclient_command
+ 	shutdown_commands,
+  	test_commands,
+ 	wkssvc_commands,
++#ifdef EXTRA_SERVICES
+ 	ntsvcs_commands,
+ 	drsuapi_commands,
+ 	eventlog_commands,
++#endif
+ 	winreg_commands,
+ 	NULL
+ };
diff --git a/net/samba36/patches/140-no_winreg_support.patch b/net/samba36/patches/140-no_winreg_support.patch
index 0751c84a3..3726bc283 100644
--- a/net/samba36/patches/140-no_winreg_support.patch
+++ b/net/samba36/patches/140-no_winreg_support.patch
@@ -132,3 +132,15 @@
  	tmp_ctx = talloc_stackframe();
  	if (tmp_ctx == NULL) {
  		return NULL;
+--- a/source3/rpcclient/rpcclient.c
++++ b/source3/rpcclient/rpcclient.c
+@@ -640,7 +640,9 @@ static struct cmd_set *rpcclient_command
+ 	drsuapi_commands,
+ 	eventlog_commands,
+ #endif
++#ifdef WINREG_SUPPORT
+ 	winreg_commands,
++#endif
+ 	NULL
+ };
+ 
diff --git a/net/samba36/patches/150-no_dfs_api.patch b/net/samba36/patches/150-no_dfs_api.patch
index 7b6908743..00db75821 100644
--- a/net/samba36/patches/150-no_dfs_api.patch
+++ b/net/samba36/patches/150-no_dfs_api.patch
@@ -57,3 +57,15 @@
  		rpc_initshutdown_shutdown();
  #ifdef EXTRA_SERVICES
  		rpc_eventlog_shutdown();
+--- a/source3/rpcclient/rpcclient.c
++++ b/source3/rpcclient/rpcclient.c
+@@ -629,7 +629,9 @@ static struct cmd_set *rpcclient_command
+ #endif
+ 	netlogon_commands,
+ 	srvsvc_commands,
++#ifdef DFS_SUPPORT
+ 	dfs_commands,
++#endif
+ 	echo_commands,
+ 	epmapper_commands,
+ 	shutdown_commands,
diff --git a/net/samba36/patches/160-add_missing_ifdef.patch b/net/samba36/patches/160-add_missing_ifdef.patch
index 4aab79a48..c2d9cd282 100644
--- a/net/samba36/patches/160-add_missing_ifdef.patch
+++ b/net/samba36/patches/160-add_missing_ifdef.patch
@@ -12,3 +12,15 @@
  	if (!smb_register_ndr_interface(&ndr_table_initshutdown)) {
  		return false;
  	}
+--- a/source3/rpcclient/rpcclient.c
++++ b/source3/rpcclient/rpcclient.c
+@@ -632,7 +632,9 @@ static struct cmd_set *rpcclient_command
+ #ifdef DFS_SUPPORT
+ 	dfs_commands,
+ #endif
++#ifdef DEVELOPER
+ 	echo_commands,
++#endif
+ 	epmapper_commands,
+ 	shutdown_commands,
+  	test_commands,
diff --git a/net/samba36/patches/170-no_wkssvc_support.patch b/net/samba36/patches/170-no_wkssvc_support.patch
index 40dd9fb48..557357598 100644
--- a/net/samba36/patches/170-no_wkssvc_support.patch
+++ b/net/samba36/patches/170-no_wkssvc_support.patch
@@ -59,13 +59,13 @@
  		return false;
 --- a/source3/rpcclient/rpcclient.c
 +++ b/source3/rpcclient/rpcclient.c
-@@ -634,7 +634,9 @@ static struct cmd_set *rpcclient_command
+@@ -638,7 +638,9 @@ static struct cmd_set *rpcclient_command
  	epmapper_commands,
  	shutdown_commands,
   	test_commands,
 +#ifdef WKSSVC_SUPPORT
  	wkssvc_commands,
 +#endif
+ #ifdef EXTRA_SERVICES
  	ntsvcs_commands,
  	drsuapi_commands,
- 	eventlog_commands,
diff --git a/net/samba36/patches/180-no_domain_logon.patch b/net/samba36/patches/180-no_domain_logon.patch
index 6345658da..aa249628e 100644
--- a/net/samba36/patches/180-no_domain_logon.patch
+++ b/net/samba36/patches/180-no_domain_logon.patch
@@ -85,3 +85,15 @@
  	in_addr_to_sockaddr_storage(&ss, p->ip);
  	pss = iface_ip((struct sockaddr *)&ss);
  	if (!pss) {
+--- a/source3/rpcclient/rpcclient.c
++++ b/source3/rpcclient/rpcclient.c
+@@ -627,7 +627,9 @@ static struct cmd_set *rpcclient_command
+ #ifdef PRINTER_SUPPORT
+ 	spoolss_commands,
+ #endif
++#ifdef NETLOGON_SUPPORT
+ 	netlogon_commands,
++#endif
+ 	srvsvc_commands,
+ #ifdef DFS_SUPPORT
+ 	dfs_commands,
diff --git a/net/samba36/patches/190-no_srvsvc.patch b/net/samba36/patches/190-no_srvsvc.patch
index 91cb20bac..e9aefe131 100644
--- a/net/samba36/patches/190-no_srvsvc.patch
+++ b/net/samba36/patches/190-no_srvsvc.patch
@@ -58,3 +58,15 @@
  
  	lsarpc_cb.init         = lsarpc_init_cb;
  	lsarpc_cb.shutdown     = NULL;
+--- a/source3/rpcclient/rpcclient.c
++++ b/source3/rpcclient/rpcclient.c
+@@ -630,7 +630,9 @@ static struct cmd_set *rpcclient_command
+ #ifdef NETLOGON_SUPPORT
+ 	netlogon_commands,
+ #endif
++#ifdef NETLOGON_SUPPORT
+ 	srvsvc_commands,
++#endif
+ #ifdef DFS_SUPPORT
+ 	dfs_commands,
+ #endif