diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index da30c4433d5..042d1797ba5 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -98,6 +98,10 @@ class BasicTests(unittest.TestCase):
         p2 = ssl.DER_cert_to_PEM_cert(d1)
         d2 = ssl.PEM_cert_to_DER_cert(p2)
         self.assertEqual(d1, d2)
+        if not p2.startswith(ssl.PEM_HEADER + '\n'):
+            self.fail("DER-to-PEM didn't include correct header:\n%r\n" % p2)
+        if not p2.endswith('\n' + ssl.PEM_FOOTER + '\n'):
+            self.fail("DER-to-PEM didn't include correct footer:\n%r\n" % p2)
 
     @support.cpython_only
     def test_refcycle(self):
diff --git a/Misc/ACKS b/Misc/ACKS
index b8d1dee65ea..c5ecfa2c356 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -766,6 +766,7 @@ Roger Upole
 Michael Urman
 Hector Urtubia
 Andi Vajda
+Kyle VanderBeek
 Atul Varma
 Dmitry Vasiliev
 Alexandre Vassalotti