diff --git a/Lib/netrc.py b/Lib/netrc.py
index d24c388..60849ce 100644
--- a/Lib/netrc.py
+++ b/Lib/netrc.py
@@ -15,7 +15,8 @@
         self.hosts = {}
         self.macros = {}
         lexer = shlex.shlex(fp)
-        lexer.wordchars = lexer.wordchars + '.'
+	# Allows @ in hostnames.  Not a big deal...
+        lexer.wordchars = lexer.wordchars + '.-@'
         while 1:
             # Look for a machine, default, or macdef top-level keyword
             toplevel = tt = lexer.get_token()