diff --git a/oauth2client/tools.py b/oauth2client/tools.py
index f2add0b..63d673a 100644
--- a/oauth2client/tools.py
+++ b/oauth2client/tools.py
@@ -125,6 +125,11 @@
   print 'Go to the following link in your browser:'
   print authorize_url
   print
+  if FLAGS.auth_local_webserver:
+    print 'If your browser is on a different machine then exit and re-run this'
+    print 'application with the command-line parameter --noauth_local_webserver.'
+    print
+
 
   if FLAGS.auth_local_webserver:
     httpd.handle_request()