diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 411a1f53d16..aff5bbefa3d 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -608,7 +608,7 @@ sub command_line_setup () {
              # Specify ports
              'master_port=i'            => \$opt_master_myport,
              'slave_port=i'             => \$opt_slave_myport,
-             'ndbcluster-port=i'        => \$opt_ndbcluster_port,
+             'ndbcluster-port|ndbcluster_port=i' => \$opt_ndbcluster_port,
              'ndbcluster-port-slave=i'  => \$opt_ndbcluster_port_slave,
              'manager-port=i'           => \$opt_manager_port, # Currently not used
              'im-port=i'                => \$im_port, # Instance Manager port.
diff --git a/scripts/make_win_src_distribution.sh b/scripts/make_win_src_distribution.sh
index 22c0ea7c839..f9008bdfeae 100644
--- a/scripts/make_win_src_distribution.sh
+++ b/scripts/make_win_src_distribution.sh
@@ -184,7 +184,7 @@ rm -r -f "$BASE/share/Makefile"
 rm -r -f "$BASE/share/Makefile.in"
 rm -r -f "$BASE/share/Makefile.am"
 
-mkdir $BASE/Docs $BASE/extra $BASE/include $BASE/storage
+mkdir $BASE/Docs $BASE/extra $BASE/include
 
 #
 # Copy directory files
@@ -251,7 +251,7 @@ copy_dir_dirs() {
 
 for i in client dbug extra storage/heap include storage/archive storage/csv \
          include/mysql libmysql libmysqld storage/myisam storage/example \
-         storage/myisammrg mysys regex sql strings sql-common sql/examples \
+         storage/myisammrg mysys regex sql strings sql-common \
          tools vio zlib
 do
   copy_dir_files $i
@@ -260,7 +260,7 @@ done
 #
 # Create project files for ndb
 #
-make -C $SOURCE/storage/ndb windoze
+#make -C $SOURCE/storage/ndb windoze
 
 #
 # Input directories to be copied recursively
@@ -298,8 +298,6 @@ do
   fi
 done
 
-cp extra/sql_state.h extra/mysqld_error.h $BASE/include
-
 #
 # support files
 #
@@ -350,8 +348,6 @@ find $BASE \( -name "*.cnf" -o -name "*.ini" \
   do
     unix_to_dos $v
   done
-# File extension '.txt' matches too many other files, error messages etc.
-unix_to_dos $BASE/Docs/*.txt 
 
 mv $BASE/README $BASE/README.txt