diff --git a/CMakeLists.txt b/CMakeLists.txt
index 314bf6964..aae3e6268 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -156,12 +156,12 @@ add_subdirectory(libfreerdp-rail)
 add_subdirectory(libfreerdp-cache)
 add_subdirectory(libfreerdp-codec)
 add_subdirectory(libfreerdp-crypto)
-add_subdirectory(libfreerdp-sspi)
 add_subdirectory(libfreerdp-channels)
 add_subdirectory(libfreerdp-locale)
 add_subdirectory(libfreerdp-core)
 
 add_subdirectory(libwinpr-rpc)
+add_subdirectory(libwinpr-sspi)
 
 if(NOT WIN32)
 	add_subdirectory(channels)
diff --git a/include/freerdp/sspi/credssp.h b/include/winpr/credssp.h
similarity index 98%
rename from include/freerdp/sspi/credssp.h
rename to include/winpr/credssp.h
index ffc470ed9..2e690ccd0 100644
--- a/include/freerdp/sspi/credssp.h
+++ b/include/winpr/credssp.h
@@ -28,7 +28,7 @@ typedef struct rdp_credssp rdpCredssp;
 #include <freerdp/utils/stream.h>
 #include <freerdp/utils/hexdump.h>
 
-#include <freerdp/sspi/sspi.h>
+#include <winpr/sspi.h>
 
 #include <freerdp/crypto/tls.h>
 #include <freerdp/crypto/ber.h>
diff --git a/include/freerdp/sspi/sspi.h b/include/winpr/sspi.h
similarity index 100%
rename from include/freerdp/sspi/sspi.h
rename to include/winpr/sspi.h
diff --git a/libfreerdp-core/CMakeLists.txt b/libfreerdp-core/CMakeLists.txt
index 6aa6da49e..4161e101e 100644
--- a/libfreerdp-core/CMakeLists.txt
+++ b/libfreerdp-core/CMakeLists.txt
@@ -105,11 +105,11 @@ endif()
 target_link_libraries(freerdp-core freerdp-utils)
 target_link_libraries(freerdp-core freerdp-codec)
 target_link_libraries(freerdp-core freerdp-crypto)
-target_link_libraries(freerdp-core freerdp-sspi)
 target_link_libraries(freerdp-core freerdp-locale)
 target_link_libraries(freerdp-core ${OPENSSL_LIBRARIES})
 
 target_link_libraries(freerdp-core winpr-rpc)
+target_link_libraries(freerdp-core winpr-sspi)
 
 install(TARGETS freerdp-core DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
diff --git a/libfreerdp-core/rpc.h b/libfreerdp-core/rpc.h
index 40acbca4e..ff9f2db82 100644
--- a/libfreerdp-core/rpc.h
+++ b/libfreerdp-core/rpc.h
@@ -30,9 +30,9 @@ typedef struct rdp_ntlm_http rdpNtlmHttp;
 #include "transport.h"
 
 #include <time.h>
+#include <winpr/sspi.h>
 #include <freerdp/types.h>
 #include <freerdp/settings.h>
-#include <freerdp/sspi/sspi.h>
 #include <freerdp/crypto/tls.h>
 #include <freerdp/crypto/crypto.h>
 #include <freerdp/utils/wait_obj.h>
diff --git a/libfreerdp-core/transport.c b/libfreerdp-core/transport.c
index 629d542e2..46c21652d 100644
--- a/libfreerdp-core/transport.c
+++ b/libfreerdp-core/transport.c
@@ -39,7 +39,7 @@
 #include "fastpath.h"
 #include "transport.h"
 
-#include <freerdp/sspi/credssp.h>
+#include <winpr/credssp.h>
 
 #define BUFFER_SIZE 16384
 
diff --git a/libfreerdp-core/transport.h b/libfreerdp-core/transport.h
index b0075d6e0..e774cadce 100644
--- a/libfreerdp-core/transport.h
+++ b/libfreerdp-core/transport.h
@@ -32,8 +32,9 @@ typedef struct rdp_transport rdpTransport;
 
 #include "tcp.h"
 #include "tsg.h"
+
+#include <winpr/sspi.h>
 #include <freerdp/crypto/tls.h>
-#include <freerdp/sspi/credssp.h>
 
 #include <time.h>
 #include <freerdp/types.h>
diff --git a/libfreerdp-sspi/CMakeLists.txt b/libwinpr-sspi/CMakeLists.txt
similarity index 64%
rename from libfreerdp-sspi/CMakeLists.txt
rename to libwinpr-sspi/CMakeLists.txt
index d90f430a2..08f8c39c2 100644
--- a/libfreerdp-sspi/CMakeLists.txt
+++ b/libwinpr-sspi/CMakeLists.txt
@@ -1,5 +1,5 @@
-# FreeRDP: A Remote Desktop Protocol Client
-# libfreerdp-sspi cmake build script
+# WinPR: Windows Portable Runtime
+# libwinpr-sspi cmake build script
 #
 # Copyright 2011 O.S. Systems Software Ltda.
 # Copyright 2011 Otavio Salvador <otavio@ossystems.com.br>
@@ -17,7 +17,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set(FREERDP_SSPI_NTLM_SRCS
+set(WINPR_SSPI_NTLM_SRCS
 	NTLM/ntlm_av_pairs.c
 	NTLM/ntlm_av_pairs.h
 	NTLM/ntlm_compute.c
@@ -27,7 +27,7 @@ set(FREERDP_SSPI_NTLM_SRCS
 	NTLM/ntlm.c
 	NTLM/ntlm.h)
 
-set(FREERDP_SSPI_KERBEROS_SRCS
+set(WINPR_SSPI_KERBEROS_SRCS
 	Kerberos/kerberos_crypto.c
 	Kerberos/kerberos_crypto.h
 	Kerberos/kerberos_decode.c
@@ -37,36 +37,36 @@ set(FREERDP_SSPI_KERBEROS_SRCS
 	Kerberos/kerberos.c
 	Kerberos/kerberos.h)
 	
-set(FREERDP_SSPI_NEGOTIATE_SRCS
+set(WINPR_SSPI_NEGOTIATE_SRCS
 	Negotiate/negotiate.c
 	Negotiate/negotiate.h)
 
-set(FREERDP_SSPI_SRCS
+set(WINPR_SSPI_SRCS
 	sspi.c
 	sspi.h
 	credssp.c)
 
 if(NOT WITH_NATIVE_SSPI)
-	set(FREERDP_SSPI_SRCS
-		${FREERDP_SSPI_NTLM_SRCS}
-		${FREERDP_SSPI_KERBEROS_SRCS}
-		${FREERDP_SSPI_NEGOTIATE_SRCS}
-		${FREERDP_SSPI_SRCS})
+	set(WINPR_SSPI_SRCS
+		${WINPR_SSPI_NTLM_SRCS}
+		${WINPR_SSPI_KERBEROS_SRCS}
+		${WINPR_SSPI_NEGOTIATE_SRCS}
+		${WINPR_SSPI_SRCS})
 else()
 	add_definitions(-DNATIVE_SSPI)
 endif()
 
 
-add_library(freerdp-sspi ${FREERDP_SSPI_SRCS})
+add_library(winpr-sspi ${WINPR_SSPI_SRCS})
 
 include_directories(${OPENSSL_INCLUDE_DIR})
 include_directories(${ZLIB_INCLUDE_DIRS})
 
-set_target_properties(freerdp-sspi PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVERSION ${FREERDP_VERSION} PREFIX "lib")
+set_target_properties(winpr-sspi PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVERSION ${FREERDP_VERSION} PREFIX "lib")
 
-target_link_libraries(freerdp-sspi freerdp-utils)
-target_link_libraries(freerdp-sspi freerdp-crypto)
-target_link_libraries(freerdp-sspi ${ZLIB_LIBRARIES})	
+target_link_libraries(winpr-sspi freerdp-utils)
+target_link_libraries(winpr-sspi freerdp-crypto)
+target_link_libraries(winpr-sspi ${ZLIB_LIBRARIES})	
 
-install(TARGETS freerdp-sspi DESTINATION ${CMAKE_INSTALL_LIBDIR})
+install(TARGETS winpr-sspi DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
diff --git a/libfreerdp-sspi/Kerberos/kerberos.c b/libwinpr-sspi/Kerberos/kerberos.c
similarity index 99%
rename from libfreerdp-sspi/Kerberos/kerberos.c
rename to libwinpr-sspi/Kerberos/kerberos.c
index aa304b901..ef21bd3bf 100644
--- a/libfreerdp-sspi/Kerberos/kerberos.c
+++ b/libwinpr-sspi/Kerberos/kerberos.c
@@ -37,7 +37,7 @@
 #include "kerberos_encode.h"
 #include "kerberos_decode.h"
 
-#include <freerdp/sspi/sspi.h>
+#include <winpr/sspi.h>
 
 #include <freerdp/utils/tcp.h>
 #include <freerdp/utils/time.h>
diff --git a/libfreerdp-sspi/Kerberos/kerberos.h b/libwinpr-sspi/Kerberos/kerberos.h
similarity index 99%
rename from libfreerdp-sspi/Kerberos/kerberos.h
rename to libwinpr-sspi/Kerberos/kerberos.h
index 6d65c244f..0f881bcc6 100644
--- a/libfreerdp-sspi/Kerberos/kerberos.h
+++ b/libwinpr-sspi/Kerberos/kerberos.h
@@ -34,11 +34,11 @@
 
 #include <sys/types.h>
 
+#include <winpr/sspi.h>
 #include <freerdp/types.h>
 #include <freerdp/settings.h>
 #include <freerdp/utils/stream.h>
 #include <freerdp/utils/blob.h>
-#include <freerdp/sspi/sspi.h>
 
 #define MSKRB_OID               "1.2.840.48018.1.2.2"
 #define STDKRB_OID              "1.2.840.113554.1.2.2"
diff --git a/libfreerdp-sspi/Kerberos/kerberos_crypto.c b/libwinpr-sspi/Kerberos/kerberos_crypto.c
similarity index 100%
rename from libfreerdp-sspi/Kerberos/kerberos_crypto.c
rename to libwinpr-sspi/Kerberos/kerberos_crypto.c
diff --git a/libfreerdp-sspi/Kerberos/kerberos_crypto.h b/libwinpr-sspi/Kerberos/kerberos_crypto.h
similarity index 100%
rename from libfreerdp-sspi/Kerberos/kerberos_crypto.h
rename to libwinpr-sspi/Kerberos/kerberos_crypto.h
diff --git a/libfreerdp-sspi/Kerberos/kerberos_decode.c b/libwinpr-sspi/Kerberos/kerberos_decode.c
similarity index 100%
rename from libfreerdp-sspi/Kerberos/kerberos_decode.c
rename to libwinpr-sspi/Kerberos/kerberos_decode.c
diff --git a/libfreerdp-sspi/Kerberos/kerberos_decode.h b/libwinpr-sspi/Kerberos/kerberos_decode.h
similarity index 100%
rename from libfreerdp-sspi/Kerberos/kerberos_decode.h
rename to libwinpr-sspi/Kerberos/kerberos_decode.h
diff --git a/libfreerdp-sspi/Kerberos/kerberos_encode.c b/libwinpr-sspi/Kerberos/kerberos_encode.c
similarity index 100%
rename from libfreerdp-sspi/Kerberos/kerberos_encode.c
rename to libwinpr-sspi/Kerberos/kerberos_encode.c
diff --git a/libfreerdp-sspi/Kerberos/kerberos_encode.h b/libwinpr-sspi/Kerberos/kerberos_encode.h
similarity index 100%
rename from libfreerdp-sspi/Kerberos/kerberos_encode.h
rename to libwinpr-sspi/Kerberos/kerberos_encode.h
diff --git a/libfreerdp-sspi/NTLM/ntlm.c b/libwinpr-sspi/NTLM/ntlm.c
similarity index 99%
rename from libfreerdp-sspi/NTLM/ntlm.c
rename to libwinpr-sspi/NTLM/ntlm.c
index b2b99586c..f2a9cb82f 100644
--- a/libfreerdp-sspi/NTLM/ntlm.c
+++ b/libwinpr-sspi/NTLM/ntlm.c
@@ -25,7 +25,7 @@
 #include <openssl/engine.h>
 #include <freerdp/utils/memory.h>
 
-#include <freerdp/sspi/sspi.h>
+#include <winpr/sspi.h>
 
 #include "ntlm.h"
 #include "../sspi.h"
diff --git a/libfreerdp-sspi/NTLM/ntlm.h b/libwinpr-sspi/NTLM/ntlm.h
similarity index 98%
rename from libfreerdp-sspi/NTLM/ntlm.h
rename to libwinpr-sspi/NTLM/ntlm.h
index 08e724373..333a577b4 100644
--- a/libfreerdp-sspi/NTLM/ntlm.h
+++ b/libwinpr-sspi/NTLM/ntlm.h
@@ -20,7 +20,7 @@
 #ifndef FREERDP_SSPI_NTLM_PRIVATE_H
 #define FREERDP_SSPI_NTLM_PRIVATE_H
 
-#include <freerdp/sspi/sspi.h>
+#include <winpr/sspi.h>
 #include <freerdp/crypto/crypto.h>
 
 #include <freerdp/utils/unicode.h>
diff --git a/libfreerdp-sspi/NTLM/ntlm_av_pairs.c b/libwinpr-sspi/NTLM/ntlm_av_pairs.c
similarity index 100%
rename from libfreerdp-sspi/NTLM/ntlm_av_pairs.c
rename to libwinpr-sspi/NTLM/ntlm_av_pairs.c
diff --git a/libfreerdp-sspi/NTLM/ntlm_av_pairs.h b/libwinpr-sspi/NTLM/ntlm_av_pairs.h
similarity index 100%
rename from libfreerdp-sspi/NTLM/ntlm_av_pairs.h
rename to libwinpr-sspi/NTLM/ntlm_av_pairs.h
diff --git a/libfreerdp-sspi/NTLM/ntlm_compute.c b/libwinpr-sspi/NTLM/ntlm_compute.c
similarity index 100%
rename from libfreerdp-sspi/NTLM/ntlm_compute.c
rename to libwinpr-sspi/NTLM/ntlm_compute.c
diff --git a/libfreerdp-sspi/NTLM/ntlm_compute.h b/libwinpr-sspi/NTLM/ntlm_compute.h
similarity index 100%
rename from libfreerdp-sspi/NTLM/ntlm_compute.h
rename to libwinpr-sspi/NTLM/ntlm_compute.h
diff --git a/libfreerdp-sspi/NTLM/ntlm_message.c b/libwinpr-sspi/NTLM/ntlm_message.c
similarity index 100%
rename from libfreerdp-sspi/NTLM/ntlm_message.c
rename to libwinpr-sspi/NTLM/ntlm_message.c
diff --git a/libfreerdp-sspi/NTLM/ntlm_message.h b/libwinpr-sspi/NTLM/ntlm_message.h
similarity index 100%
rename from libfreerdp-sspi/NTLM/ntlm_message.h
rename to libwinpr-sspi/NTLM/ntlm_message.h
diff --git a/libfreerdp-sspi/Negotiate/negotiate.c b/libwinpr-sspi/Negotiate/negotiate.c
similarity index 99%
rename from libfreerdp-sspi/Negotiate/negotiate.c
rename to libwinpr-sspi/Negotiate/negotiate.c
index a37357e3a..a5e3c534a 100644
--- a/libfreerdp-sspi/Negotiate/negotiate.c
+++ b/libwinpr-sspi/Negotiate/negotiate.c
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-#include <freerdp/sspi/sspi.h>
+#include <winpr//sspi.h>
 #include <freerdp/utils/memory.h>
 
 #include "negotiate.h"
diff --git a/libfreerdp-sspi/Negotiate/negotiate.h b/libwinpr-sspi/Negotiate/negotiate.h
similarity index 97%
rename from libfreerdp-sspi/Negotiate/negotiate.h
rename to libwinpr-sspi/Negotiate/negotiate.h
index 5ce064a75..ab0e82bbb 100644
--- a/libfreerdp-sspi/Negotiate/negotiate.h
+++ b/libwinpr-sspi/Negotiate/negotiate.h
@@ -20,7 +20,7 @@
 #ifndef FREERDP_SSPI_NEGOTIATE_PRIVATE_H
 #define FREERDP_SSPI_NEGOTIATE_PRIVATE_H
 
-#include <freerdp/sspi/sspi.h>
+#include <winpr/sspi.h>
 #include <freerdp/utils/unicode.h>
 
 #include "../Kerberos/kerberos.h"
diff --git a/libfreerdp-sspi/credssp.c b/libwinpr-sspi/credssp.c
similarity index 99%
rename from libfreerdp-sspi/credssp.c
rename to libwinpr-sspi/credssp.c
index 8cf8b480a..151710e6b 100644
--- a/libfreerdp-sspi/credssp.c
+++ b/libwinpr-sspi/credssp.c
@@ -26,8 +26,8 @@
 #include <freerdp/crypto/tls.h>
 #include <freerdp/utils/stream.h>
 
-#include <freerdp/sspi/sspi.h>
-#include <freerdp/sspi/credssp.h>
+#include <winpr/sspi.h>
+#include <winpr/credssp.h>
 
 #include "sspi.h"
 
diff --git a/libfreerdp-sspi/sspi.c b/libwinpr-sspi/sspi.c
similarity index 99%
rename from libfreerdp-sspi/sspi.c
rename to libwinpr-sspi/sspi.c
index a637f1e87..6b7ce5ee0 100644
--- a/libfreerdp-sspi/sspi.c
+++ b/libwinpr-sspi/sspi.c
@@ -19,7 +19,7 @@
 
 #include <freerdp/utils/memory.h>
 
-#include <freerdp/sspi/sspi.h>
+#include <winpr/sspi.h>
 
 #include "sspi.h"
 
diff --git a/libfreerdp-sspi/sspi.h b/libwinpr-sspi/sspi.h
similarity index 98%
rename from libfreerdp-sspi/sspi.h
rename to libwinpr-sspi/sspi.h
index e8c01a638..0de4ea092 100644
--- a/libfreerdp-sspi/sspi.h
+++ b/libwinpr-sspi/sspi.h
@@ -21,8 +21,9 @@
 #define FREERDP_AUTH_SSPI_PRIVATE_H
 
 #include "config.h"
+
+#include <winpr/sspi.h>
 #include <freerdp/types.h>
-#include <freerdp/sspi/sspi.h>
 
 struct _CREDENTIALS
 {