diff --git a/distrib/msw/makerpm b/distrib/msw/makerpm
index 6071d938de..0f222f246e 100755
--- a/distrib/msw/makerpm
+++ b/distrib/msw/makerpm
@@ -188,25 +188,6 @@ dospinwxx11()
   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