diff -urpN jumbo-jmb2/src/sse-intrinsics.h jumbo-jmb/src/sse-intrinsics.h
--- jumbo-jmb2/src/sse-intrinsics.h	2012-06-21 16:09:43.500000000 +0000
+++ jumbo-jmb/src/sse-intrinsics.h	2012-06-21 15:42:31.515625000 +0000
@@ -10,6 +10,8 @@
 #define SSE_type			"XOP intrinsics"
 #elif defined(__AVX__)
 #define SSE_type			"AVX intrinsics"
+#elif defined(MMX_COEF) && MMX_COEF == 2
+#define SSE_type			"MMX"
 #else
 #define SSE_type			"SSE2 intrinsics"
 #endif
diff -urpN jumbo-jmb2/src/episerver_fmt_plug.c jumbo-jmb/src/episerver_fmt_plug.c
--- jumbo-jmb2/src/episerver_fmt_plug.c	2012-06-21 16:09:40.687500000 +0000
+++ jumbo-jmb/src/episerver_fmt_plug.c	2012-06-21 15:48:45.234375000 +0000
@@ -104,8 +104,8 @@ static void *get_salt(char *ciphertext)
 	char *ctcopy = strdup(ciphertext);
 	char *keeptr = ctcopy;
 	char *p;
-	ctcopy += 12;	/* skip over "$episerver$*" */
 	static struct custom_salt cs;
+	ctcopy += 12;	/* skip over "$episerver$*" */
 	p = strtok(ctcopy, "*");
 	cs.version = atoi(p);
 	p = strtok(NULL, "*");
diff -urpN jumbo-jmb2/src/gost.h jumbo-jmb/src/gost.h
--- jumbo-jmb2/src/gost.h	2012-06-21 16:09:40.875000000 +0000
+++ jumbo-jmb/src/gost.h	2012-06-21 15:48:57.484375000 +0000
@@ -1,7 +1,7 @@
 /* gost.h */
 #ifndef GOST_H
 #define GOST_H
-#include <stdint.h>
+#include "stdint.h"
 #include <stdlib.h>
 #ifdef __GLIBC__
 # include <endian.h>
diff -urpN jumbo-jmb2/src/johnswap.h jumbo-jmb/src/johnswap.h
--- jumbo-jmb2/src/johnswap.h	2012-06-21 16:09:41.171875000 +0000
+++ jumbo-jmb/src/johnswap.h	2012-06-21 15:48:08.875000000 +0000
@@ -10,9 +10,9 @@
 #	include <byteswap.h>
 #	define JOHNSWAP(x)	bswap_32((x))
 #elif _MSC_VER
-#	if !defined (MD5_SSE_PARA)
-#		include <intrin.h>
-#	endif
+//#	if !defined (MD5_SSE_PARA)
+//#		include <intrin.h>
+//#	endif
 #	define JOHNSWAP(x)	_byteswap_ulong((x))
 #else
 #	define JOHNSWAP(x)	john_bswap_32((x))
diff -urpN jumbo-jmb2/src/md4-mmx.S jumbo-jmb/src/md4-mmx.S
--- jumbo-jmb2/src/md4-mmx.S	2012-06-21 16:09:41.531250000 +0000
+++ jumbo-jmb/src/md4-mmx.S	2012-06-21 16:00:59.796875000 +0000
@@ -27,7 +27,7 @@
 // For proper VC 'param marshalling' function stubs.
 #ifdef __MINGW32__
 #define mdfourmmx_VC @mdfourmmx_VC@12
-#define mdfourmmx_nosizeupdate_VC _mdfourmmx_nosizeupdate_VC@12
+#define mdfourmmx_nosizeupdate_VC @mdfourmmx_nosizeupdate_VC@12
 .globl mdfourmmx_VC
 .globl mdfourmmx_nosizeupdate_VC
 #endif
diff -urpN jumbo-jmb2/src/racf_fmt_plug.c jumbo-jmb/src/racf_fmt_plug.c
--- jumbo-jmb2/src/racf_fmt_plug.c	2012-06-21 16:09:43.078125000 +0000
+++ jumbo-jmb/src/racf_fmt_plug.c	2012-06-21 15:49:17.218750000 +0000
@@ -145,8 +145,8 @@ static void *get_salt(char *ciphertext)
 {
 	char *ctcopy = strdup(ciphertext);
 	char *keeptr = ctcopy, *username;
-	ctcopy += 7;	/* skip over "$racf$*" */
 	static struct custom_salt cs;
+	ctcopy += 7;	/* skip over "$racf$*" */
 	username = strtok(ctcopy, "*");
 	/* process username */
 	strcpy((char*)cs.userid, username);