diff --git a/common/bin/compare.sh b/common/bin/compare.sh
index aab24421caf221aba1da1d8c14c16bf45a14742b..bcca754cd67dfab70115f7139015c68f91198ab1 100644
--- a/common/bin/compare.sh
+++ b/common/bin/compare.sh
@@ -1166,14 +1166,25 @@ if [ -z "$OTHER_DOCS" ]; then
     echo "WARNING! Other build doesn't contain docs, skipping doc compare."
 fi
 
-if [ -f "$OTHER/tmp/sec-bin.zip" ]; then
-    OTHER_SEC_BIN="$OTHER/tmp/sec-bin.zip"
-elif [ -f "$OTHER/images/sec-bin.zip" ]; then
-    OTHER_SEC_BIN="$OTHER/tmp/sec-bin.zip"
+if [ -d "$OTHER/images" ]; then
+    OTHER_SEC_DIR="$OTHER/images"
 else
-    echo "WARNING! No sec-bin.zip found in other."
+    OTHER_SEC_DIR="$OTHER/tmp"
+fi
+OTHER_SEC_BIN="$OTHER_SEC_DIR/sec-bin.zip"
+THIS_SEC_DIR="$THIS/images"
+THIS_SEC_BIN="$THIS_SEC_DIR/sec-bin.zip"
+if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
+    if [ "$OPENJDK_TARGET_CPU" = "x86_64" ]; then
+        JGSS_WINDOWS_BIN="jgss-windows-x64-bin.zip"
+    else
+        JGSS_WINDOWS_BIN="jgss-windows-i586-bin.zip"
+    fi
+    OTHER_SEC_WINDOWS_BIN="$OTHER_SEC_DIR/sec-windows-bin.zip"
+    OTHER_JGSS_WINDOWS_BIN="$OTHER_SEC_DIR/$JGSS_WINDOWS_BIN"
+    THIS_SEC_WINDOWS_BIN="$THIS_SEC_DIR/sec-windows-bin.zip"
+    THIS_JGSS_WINDOWS_BIN="$THIS_SEC_DIR/$JGSS_WINDOWS_BIN"
 fi
-THIS_SEC_BIN="$THIS/images/sec-bin.zip"
 
 ##########################################################################################
 # Do the work
diff --git a/common/bin/compare_exceptions.sh.incl b/common/bin/compare_exceptions.sh.incl
index 0446dbc150a63fb3913e97dee2562e6131b86bd3..1406010dc34e3d9b41bce0329439d7fd27a5c3c8 100644
--- a/common/bin/compare_exceptions.sh.incl
+++ b/common/bin/compare_exceptions.sh.incl
@@ -807,6 +807,10 @@ fi
 
 if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
 
+ACCEPTED_JARZIP_CONTENTS="
+/bin/w2k_lsa_auth.dll
+"
+
 # Probably should add all libs here
 ACCEPTED_SMALL_SIZE_DIFF="
 ./demo/jvmti/gctest/lib/gctest.dll