diff --git a/Lib/getpass.py b/Lib/getpass.py
index 53689e9..6ec6c788 100644
--- a/Lib/getpass.py
+++ b/Lib/getpass.py
@@ -40,6 +40,7 @@
     """
     fd = None
     tty = None
+    passwd = None
     try:
         # Always try reading and writing directly on the tty first.
         fd = os.open('/dev/tty', os.O_RDWR|os.O_NOCTTY)
diff --git a/Lib/test/test_sundry.py b/Lib/test/test_sundry.py
index a364194..84fb0db 100644
--- a/Lib/test/test_sundry.py
+++ b/Lib/test/test_sundry.py
@@ -6,7 +6,7 @@
 
 class TestUntestedModules(unittest.TestCase):
     def test_untested_modules_can_be_imported(self):
-        untested = ('bdb', 'encodings', 'formatter', 'getpass', 'imghdr',
+        untested = ('bdb', 'encodings', 'formatter', 'imghdr',
                     'keyword', 'macurl2path', 'nturl2path', 'tabnanny')
         with support.check_warnings(quiet=True):
             for name in untested:
diff --git a/Misc/ACKS b/Misc/ACKS
index 56da6cb..a29747b 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -367,6 +367,7 @@
 Troy J. Farrell
 Mark Favas
 Boris Feld
+Thomas Fenzl
 Niels Ferguson
 Sebastian Fernandez
 Florian Festi