diff --git a/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm b/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
index 7c9091ea94e..057dca6c50c 100644
--- a/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
+++ b/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
@@ -243,8 +243,18 @@ sub ParseDispatchFunction($)
 		pidl "case $op: {";
 		indent;
 		pidl "struct $fn->{NAME} *r = (struct $fn->{NAME} *)_r;";
+
+		pidl "if (DEBUGLEVEL >= 10) {";
+		pidl "\tNDR_PRINT_IN_DEBUG($fn->{NAME}, r);";
+		pidl "}";
+
 		CallWithStruct("cli->pipes_struct", "mem_ctx", $fn, 
 			sub { pidl "\treturn NT_STATUS_NO_MEMORY;"; });
+
+		pidl "if (DEBUGLEVEL >= 10) {";
+		pidl "\tNDR_PRINT_OUT_DEBUG($fn->{NAME}, r);";
+		pidl "}";
+
 		pidl "return NT_STATUS_OK;";
 		deindent;
 		pidl "}";