diff --git a/packages/dist.sh b/packages/dist.sh
index a6979a95..fbd46eb2 100755
--- a/packages/dist.sh
+++ b/packages/dist.sh
@@ -69,6 +69,7 @@ do
         ;;
       -win)
         WIN=1
+        EXTRA_EXPORT_OPTIONS="--native-eol CRLF"
         ARG_PREV=""
 	;;
       *)
@@ -229,24 +230,47 @@ cp $DISTPATH/phreeqc3-doc/NOTICE.TXT      $DISTPATH/doc/NOTICE
 
 (cd "$DISTPATH/doc" && "doxygen")
 
-echo "Rolling $DISTNAME.tar ..."
-(cd "$DIST_SANDBOX" > /dev/null && tar c "$DISTNAME") > \
-"$DISTNAME.tar"
+if [ -n "$WIN" ]; then
+  echo "Rolling $DISTNAME.zip ..."
+  (cd "$DIST_SANDBOX" > /dev/null && zip -q -r - "$DISTNAME") > \
+    "$DISTNAME.zip"
 
-echo "Compressing to $DISTNAME.tar.gz ..."
-gzip -9f "$DISTNAME.tar"
-echo "Removing sandbox..."
-rm -rf "$DIST_SANDBOX"
+  echo "Removing sandbox..."
+  rm -rf "$DIST_SANDBOX"
 
-echo ""
-echo "Done:"
-ls -l "$DISTNAME.tar.gz"
-echo ""
-echo "md5sums:"
-md5sum "$DISTNAME.tar.gz"
-type sha1sum > /dev/null 2>&1
-if [ $? -eq 0 ]; then
   echo ""
-  echo "sha1sums:"
-  sha1sum "$DISTNAME.tar.gz"
+  echo "Done:"
+  ls -l "$DISTNAME.zip"
+  echo ""
+  echo "md5sums:"
+  md5sum "$DISTNAME.zip"
+  type sha1sum > /dev/null 2>&1
+  if [ $? -eq 0 ]; then
+    echo ""
+    echo "sha1sums:"
+    sha1sum "$DISTNAME.zip"
+  fi
+else
+  echo "Rolling $DISTNAME.tar ..."
+  (cd "$DIST_SANDBOX" > /dev/null && tar c "$DISTNAME") > \
+    "$DISTNAME.tar"
+
+  echo "Compressing to $DISTNAME.tar.gz ..."
+  gzip -9f "$DISTNAME.tar"
+
+  echo "Removing sandbox..."
+  rm -rf "$DIST_SANDBOX"
+
+  echo ""
+  echo "Done:"
+  ls -l "$DISTNAME.tar.gz"
+  echo ""
+  echo "md5sums:"
+  md5sum "$DISTNAME.tar.gz"
+  type sha1sum > /dev/null 2>&1
+  if [ $? -eq 0 ]; then
+    echo ""
+    echo "sha1sums:"
+    sha1sum "$DISTNAME.tar.gz"
+  fi
 fi