diff --git a/source3/Makefile.in b/source3/Makefile.in
index 8820af14f2c..405fba4a0d1 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -595,7 +595,7 @@ LIBMSRPC_OBJ = $(SCHANNEL_OBJ) \
 	       rpc_client/cli_pipe.o \
 	       librpc/crypto/gse_krb5.o \
 	       librpc/crypto/gse.o \
-	       librpc/rpc/dcerpc_spnego.o \
+	       librpc/crypto/cli_spnego.o \
 	       librpc/rpc/rpc_common.o \
 	       rpc_client/rpc_transport_np.o \
 	       rpc_client/rpc_transport_sock.o \
diff --git a/source3/librpc/rpc/dcerpc_spnego.c b/source3/librpc/crypto/cli_spnego.c
similarity index 99%
rename from source3/librpc/rpc/dcerpc_spnego.c
rename to source3/librpc/crypto/cli_spnego.c
index 89baa03cf32..04a0922197c 100644
--- a/source3/librpc/rpc/dcerpc_spnego.c
+++ b/source3/librpc/crypto/cli_spnego.c
@@ -22,7 +22,7 @@
 #include "include/ntlmssp_wrap.h"
 #include "librpc/gen_ndr/ntlmssp.h"
 #include "librpc/crypto/gse.h"
-#include "dcerpc_spnego.h"
+#include "librpc/crypto/spnego.h"
 
 struct spnego_context {
 	enum spnego_mech mech;
@@ -367,4 +367,3 @@ DATA_BLOB spnego_get_session_key(TALLOC_CTX *mem_ctx,
 		return data_blob_null;
 	}
 }
-
diff --git a/source3/librpc/rpc/dcerpc_spnego.h b/source3/librpc/crypto/spnego.h
similarity index 95%
rename from source3/librpc/rpc/dcerpc_spnego.h
rename to source3/librpc/crypto/spnego.h
index d4e7c627860..e2a00b6ef6a 100644
--- a/source3/librpc/rpc/dcerpc_spnego.h
+++ b/source3/librpc/crypto/spnego.h
@@ -17,8 +17,8 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _DCERPC_SPNEGO_H_
-#define _DCERPC_SPENGO_H_
+#ifndef _CLI_SPNEGO_H_
+#define _CLI_SPENGO_H_
 
 struct spnego_context;
 
@@ -58,4 +58,4 @@ NTSTATUS spnego_get_negotiated_mech(struct spnego_context *sp_ctx,
 
 DATA_BLOB spnego_get_session_key(TALLOC_CTX *mem_ctx,
 				 struct spnego_context *sp_ctx);
-#endif /* _DCERPC_SPENGO_H_ */
+#endif /* _CLI_SPENGO_H_ */
diff --git a/source3/librpc/rpc/dcerpc_helpers.c b/source3/librpc/rpc/dcerpc_helpers.c
index fd51ca253ec..870706bcbe2 100644
--- a/source3/librpc/rpc/dcerpc_helpers.c
+++ b/source3/librpc/rpc/dcerpc_helpers.c
@@ -27,7 +27,7 @@
 #include "../libcli/auth/ntlmssp.h"
 #include "ntlmssp_wrap.h"
 #include "librpc/crypto/gse.h"
-#include "librpc/rpc/dcerpc_spnego.h"
+#include "librpc/crypto/spnego.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_PARSE
diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index cca4f38a8cd..8538b232ec7 100644
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -30,7 +30,7 @@
 #include "librpc/gen_ndr/ndr_dcerpc.h"
 #include "librpc/rpc/dcerpc.h"
 #include "librpc/crypto/gse.h"
-#include "librpc/rpc/dcerpc_spnego.h"
+#include "librpc/crypto/spnego.h"
 #include "rpc_dce.h"
 
 #undef DBGC_CLASS