diff --git a/App/tools/expandDBD.tcl b/App/tools/expandDBD.tcl
index 09a3a9c..0539876 100755
--- a/App/tools/expandDBD.tcl
+++ b/App/tools/expandDBD.tcl
@@ -12,14 +12,14 @@ set filesDone {}
 
 while {[llength $argv]} {
     switch -glob -- [lindex $argv 0] {
-        "-3*"   { set epicsversion [string range [lindex $argv 0] 1 end]}
-        "-q"    { set quiet 1 }
-        "-r"    { set recordtypes 1; set quiet 1 }
-        "-I"    { lappend seachpath [lindex $argv 1]; set argv [lreplace $argv 0 1]; continue }
-        "-I*"   { lappend seachpath [string range [lindex $argv 0] 2 end] }
-        "--"    { set argv [lreplace $argv 0 0]; break }
-        "-*"    { puts stderr "Unknown option [lindex $argv 0] ignored" }
-        default { break }
+        "-[0-9]*" { set epicsversion [string range [lindex $argv 0] 1 end]}
+        "-q"      { set quiet 1 }
+        "-r"      { set recordtypes 1; set quiet 1 }
+        "-I"      { lappend seachpath [lindex $argv 1]; set argv [lreplace $argv 0 1]; continue }
+        "-I*"     { lappend seachpath [string range [lindex $argv 0] 2 end] }
+        "--"      { set argv [lreplace $argv 0 0]; break }
+        "-*"      { puts stderr "Warning: Unknown option [lindex $argv 0] ignored" }
+        default   { break }
     }
     set argv [lreplace $argv 0 0]
 }