diff --git a/HISTORY b/HISTORY
index c8981a3c..89332b5f 100644
--- a/HISTORY
+++ b/HISTORY
@@ -12,6 +12,8 @@ SnapRAID HISTORY
    This had no bad effect, if not preventing the 'sync' command to run.
    A workaround was to just run 'sync' one time with the -N, --force-nocopy
    option to disable the copy detection.
+ * Restored the -O2 optimization option for Windows binaries, as -Og has a
+   too big performance penality.
 
 9.2 2016/01
 ===========
diff --git a/makedist.sh b/makedist.sh
index 0ba198e9..7741ddbf 100755
--- a/makedist.sh
+++ b/makedist.sh
@@ -2,14 +2,14 @@
 #
 
 CHECK=check
-DEBUG=--enable-debug
+DEBUG=
 
 if test "x$1" = "x-f"; then
 CHECK=clean
 fi
 
-if test "x$1" = "x-r"; then
-DEBUG=
+if test "x$1" = "x-d"; then
+DEBUG=--enable-debug
 fi
 
 make distclean