diff --git a/distrib/msw/makerpm b/distrib/msw/makerpm
index 6071d938de..7744f0c05b 100755
--- a/distrib/msw/makerpm
+++ b/distrib/msw/makerpm
@@ -61,7 +61,7 @@ dospinwxgtk()
   ls RPMS/i386
 
   cp $RPM_ROOT/SRPMS/*.rpm $WXDEST
-  cp $RPM_ROOT/RPMS/*.rpm $WXDEST
+  cp $RPM_ROOT/RPMS/i386/*.rpm $WXDEST
   cp $WXDEST/wxgtk/release/*.tar.gz $WXDEST
   cp $WXDEST/wxgtk/release/*.tar.bz2 $WXDEST
 
@@ -121,7 +121,7 @@ dospinwxbase()
   ls RPMS/i386
 
   cp $RPM_ROOT/SRPMS/*.rpm $WXDEST
-  cp $RPM_ROOT/RPMS/*.rpm $WXDEST
+  cp $RPM_ROOT/RPMS/i386/*.rpm $WXDEST
   cp $WXDEST/wxbase/release/*.tar.gz $WXDEST
   cp $WXDEST/wxbase/release/*.tar.bz2 $WXDEST
 
@@ -181,32 +181,13 @@ dospinwxx11()
   ls RPMS/i386
 
   cp $RPM_ROOT/SRPMS/*.rpm $WXDEST
-  cp $RPM_ROOT/RPMS/*.rpm $WXDEST
+  cp $RPM_ROOT/RPMS/i386/*.rpm $WXDEST
   cp $WXDEST/wxx11/release/*.tar.gz $WXDEST
   cp $WXDEST/wxx11/release/*.tar.bz2 $WXDEST
 
   echo Now try the RPMs with rpm -i.
 }
 
-init=""
-if [ "$1" = "" ]
-then
-  echo Usage: makerpm wx-dir output-dir version
-  exit
-fi
-
-if [ "$2" = "" ]
-then
-  echo Usage: makerpm wx-dir output-dir version
-  exit
-fi
-
-if [ "$3" = "" ]
-then
-  echo Usage: makerpm wx-dir output-dir version
-  exit
-fi
-
 PROGNAME=$0
 WXSRC=$1
 WXDEST=$2
@@ -232,6 +213,25 @@ usage()
     exit 1
 }
 
+init=""
+if [ "$1" = "" ]
+then
+  usage
+  exit
+fi
+
+if [ "$2" = "" ]
+then
+  usage
+  exit
+fi
+
+if [ "$3" = "" ]
+then
+  usage
+  exit
+fi
+
 # Process command line options.
 shift 3
 for i in "$@"; do