diff --git a/letsencrypt-postfix/PostfixConfigGenerator.py b/letsencrypt-postfix/PostfixConfigGenerator.py
index 927b7e729..b5adba1a2 100755
--- a/letsencrypt-postfix/PostfixConfigGenerator.py
+++ b/letsencrypt-postfix/PostfixConfigGenerator.py
@@ -296,6 +296,17 @@ class PostfixConfigGenerator:
             - `path` - file path to configuration file
         :rtype: list
         """
+        cert_materials = {'smtpd_tls_key_file': None,
+                          'smtpd_tls_cert_file': None,
+                         }
+        for num, line in enumerate(self.cf):
+            print 'Line is: %s' % line
+            num, found_var, found_value = parse_line((num, line))
+            if found_var in cert_materials.keys():
+                cert_materials[found_var] = found_value
+        return [(cert_materials['smtpd_tls_cert_file'],
+                 cert_materials['smtpd_tls_key_file'],
+                 self.fn),]
 
     def save(self, title=None, temporary=False):
         """Saves all changes to the configuration files.
diff --git a/letsencrypt-postfix/TestPostfixConfigGenerator.py b/letsencrypt-postfix/TestPostfixConfigGenerator.py
index ebcf12a4c..57cbb59c0 100644
--- a/letsencrypt-postfix/TestPostfixConfigGenerator.py
+++ b/letsencrypt-postfix/TestPostfixConfigGenerator.py
@@ -24,10 +24,9 @@ mydomain = fubard.org
 myorigin = fubard.org"""
 
 
-certs_only_config = """
-smtpd_tls_cert_file = /etc/letsencrypt/live/www.fubard.org/fullchain.pem
-smtpd_tls_key_file = /etc/letsencrypt/live/www.fubard.org/privkey.pem
-"""
+certs_only_config = (
+"""smtpd_tls_cert_file = /etc/letsencrypt/live/www.fubard.org/fullchain.pem
+smtpd_tls_key_file = /etc/letsencrypt/live/www.fubard.org/privkey.pem""")
 
 
 def GetFakeOpen(fake_file_contents):
@@ -65,9 +64,9 @@ class TestPostfixConfigGenerator(unittest.TestCase):
         self.assertEqual(sorted_names, postfix_config_gen.get_all_names())
 
     def testGetAllCertAndKeys(self):
-        return_vals = ('/etc/letsencrypt/live/www.fubard.org/fullchain.pem',
-                       '/etc/letsencrypt/live/www.fubard.org/privkey.pem',
-                       None)
+        return_vals = [('/etc/letsencrypt/live/www.fubard.org/fullchain.pem',
+                        '/etc/letsencrypt/live/www.fubard.org/privkey.pem',
+                        'tests/main.cf'),]
         postfix_config_gen = pcg.PostfixConfigGenerator(
             self.config,
             self.postfix_dir,