2 files changed, 4 insertions, 2 deletions
diff --git a/setup.cfg b/setup.cfg
index d7dfbb77..0c559613 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [egg_info]
-tag_build = dev
+tag_build = 
 tag_svn_revision = 1
 
 [aliases]
diff --git a/setuptools/command/upload.py b/setuptools/command/upload.py
index 042fcbb5..1b708943 100755
--- a/setuptools/command/upload.py
+++ b/setuptools/command/upload.py
@@ -228,8 +228,10 @@ if sys.version >= "2.5":
                                 current[key] = config.get(server, key)
                             else:
                                 current[key] = default
+                        # Issue #246, handling url ambiguity
                         if (current['server'] == repository or
-                            current['repository'] == repository):
+                            current['repository'] == repository or
+                            (current['repository'] == "http://www.python.org/pypi" and repository == self.DEFAULT_REPOSITORY)):
                             return current
                 elif 'server-login' in sections:
                     # old format