diff --git a/3rdp/build/GNUmakefile b/3rdp/build/GNUmakefile
index 03c7151093bd59241dbc8e05bfd5c2ba95af00cd..9cd32fecbfc628d31f6175177caed47a1f5b0403 100644
--- a/3rdp/build/GNUmakefile
+++ b/3rdp/build/GNUmakefile
@@ -65,7 +65,7 @@ $(CRYPT_SRC): | $(3RDPSRCDIR)
 $(CRYPT_IDIR): | $(3RDPODIR)
 	$(QUIET)$(IFNOTEXIST) mkdir $(CRYPT_IDIR)
 
-$(CRYPTLIB_BUILD): $(3RDP_ROOT)$(DIRSEP)dist/cryptlib.zip $(3RDP_ROOT)$(DIRSEP)build/SSL-fix.patch $(3RDP_ROOT)$(DIRSEP)build/random_exit.patch $(3RDP_ROOT)$(DIRSEP)build/Dynamic-linked-static-lib.patch $(3RDP_ROOT)$(DIRSEP)build/terminal-params.patch $(3RDP_ROOT)$(DIRSEP)build/cl-mingw32-static.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ranlib.patch | $(CRYPT_SRC) $(CRYPT_IDIR)
+$(CRYPTLIB_BUILD): $(3RDP_ROOT)$(DIRSEP)dist/cryptlib.zip $(3RDP_ROOT)$(DIRSEP)build/SSL-fix.patch $(3RDP_ROOT)$(DIRSEP)build/random_exit.patch $(3RDP_ROOT)$(DIRSEP)build/Dynamic-linked-static-lib.patch $(3RDP_ROOT)$(DIRSEP)build/terminal-params.patch $(3RDP_ROOT)$(DIRSEP)build/cl-mingw32-static.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ranlib.patch $(3RDP_ROOT)$(DIRSEP)build/cl-tls-psk-userfix.patch | $(CRYPT_SRC) $(CRYPT_IDIR)
 	@echo Creating $@ ...
 	$(QUIET)-rm -rf $(CRYPT_SRC)/*
 	$(QUIET)unzip -oa $(3RDPDISTDIR)$(DIRSEP)cryptlib.zip -d $(CRYPT_SRC)
@@ -75,6 +75,7 @@ $(CRYPTLIB_BUILD): $(3RDP_ROOT)$(DIRSEP)dist/cryptlib.zip $(3RDP_ROOT)$(DIRSEP)b
 	$(QUIET)patch -p0 -d $(CRYPT_SRC) < terminal-params.patch
 	$(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-mingw32-static.patch
 	$(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-ranlib.patch
+	$(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-tls-psk-userfix.patch
 ifeq ($(CC),mingw32-gcc)
 	$(QUIET)cd $(CRYPT_SRC) && env - PATH=$(PATH) CC=$(CC) AR=$(AR) RANLIB=$(RANLIB) make directories
 	$(QUIET)cd $(CRYPT_SRC) && env - PATH=$(PATH) CC=$(CC) AR=$(AR) RANLIB=$(RANLIB) make toolscripts
diff --git a/3rdp/build/cl-tls-psk-userfix.patch b/3rdp/build/cl-tls-psk-userfix.patch
new file mode 100644
index 0000000000000000000000000000000000000000..d0bfe6321fad46e3ed92836f48fba6e486a6c085
--- /dev/null
+++ b/3rdp/build/cl-tls-psk-userfix.patch
@@ -0,0 +1,11 @@
+--- session/ssl_cli.c.orig	2014-08-22 03:20:26.000000000 -0700
++++ session/ssl_cli.c	2014-08-22 03:20:53.000000000 -0700
+@@ -1342,7 +1342,7 @@
+ 										 CRYPT_SESSINFO_PASSWORD );
+ 			const ATTRIBUTE_LIST *userNamePtr = \
+ 						findSessionInfo( sessionInfoPtr->attributeList,
+-										 CRYPT_SESSINFO_PASSWORD );
++										 CRYPT_SESSINFO_USERNAME );
+ 
+ 			REQUIRES( passwordPtr != NULL );
+ 			REQUIRES( userNamePtr != NULL );