diff --git a/lib/geocoder/cli.rb b/lib/geocoder/cli.rb
index 127b8d3f2324ccb06c7c56ef083ee441fd5a55ac..b12680ca9b03ee70f36f6f03e1bd7d3ff9a8d91b 100644
--- a/lib/geocoder/cli.rb
+++ b/lib/geocoder/cli.rb
@@ -23,7 +23,7 @@ module Geocoder
         end
 
         opts.on("-p <proxy>", "--proxy <proxy>",
-          "HTTP proxy server to use (not including 'http://')") do |proxy|
+          "HTTP proxy server to use (user:pass@host:port)") do |proxy|
           Geocoder::Configuration.http_proxy = proxy
         end
 
diff --git a/lib/geocoder/configuration.rb b/lib/geocoder/configuration.rb
index 500ac9c91f73c3d60ad0161578c8b008d55e5385..3fefc7fe0212bfd772ee7572d3d1804c0dd12d5a 100644
--- a/lib/geocoder/configuration.rb
+++ b/lib/geocoder/configuration.rb
@@ -15,10 +15,10 @@ module Geocoder
         # use HTTPS for lookup requests? (if supported)
         [:use_https, false],
 
-        # HTTP proxy server (not including "http://")
+        # HTTP proxy server (user:pass@host:port)
         [:http_proxy, nil],
 
-        # HTTPS proxy server (not including "https://")
+        # HTTPS proxy server (user:pass@host:port)
         [:https_proxy, nil],
 
         # API key for geocoding service