diff --git a/Lib/quopri.py b/Lib/quopri.py
index 6d7cdd613fd7..edee3d991604 100755
--- a/Lib/quopri.py
+++ b/Lib/quopri.py
@@ -61,6 +61,8 @@ def encode(input, output, quotetabs, header = 0):
         # that trailing character encoded.
         if s and s[-1:] in ' \t':
             output.write(s[:-1] + quote(s[-1]) + lineEnd)
+        elif s == '.':
+            output.write(quote(s) + lineEnd)
         else:
             output.write(s + lineEnd)
 
diff --git a/Misc/ACKS b/Misc/ACKS
index 6569766ea999..f09e77c84c64 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -180,6 +180,7 @@ Gary Herron
 Bernhard Herzog
 Magnus L. Hetland
 Kevan Heydon
+Jason Hildebrand
 Konrad Hinsen
 David Hobley
 Tim Hochberg