diff --git a/lib/geocoder/cli.rb b/lib/geocoder/cli.rb
index 536aec09a0bcf2829f1a5143fbb12e20d1d16d5c..ab3df3b78b2ef6e97a32184212d5862bdec96293 100644
--- a/lib/geocoder/cli.rb
+++ b/lib/geocoder/cli.rb
@@ -14,7 +14,7 @@ module Geocoder
 
         opts.on("-k <key>", "--key <key>",
           "Key for geocoding API (usually optional). Enclose multi-part keys in quotes and separate parts by spaces") do |key|
-          if (key_parts = key.split(' ')).size > 1
+          if (key_parts = key.split(/\s+/)).size > 1
             Geocoder.configure(:api_key => key_parts)
           else
             Geocoder.configure(:api_key => key)