diff --git a/gnupg.py b/gnupg.py
index 062b1b7..dcb571a 100644
--- a/gnupg.py
+++ b/gnupg.py
@@ -1636,7 +1636,7 @@ class GPG(object):
             if str(val).strip():    # skip empty strings
                 parms[key] = val
         parms.setdefault('Key-Type', 'RSA')
-        parms.setdefault('Key-Length', 2048)
+        parms.setdefault('Key-Length', 4096)
         parms.setdefault('Name-Real', "Autogenerated Key")
         parms.setdefault('Name-Comment', "Generated by gnupg.py")
         try:
@@ -1649,6 +1649,8 @@ class GPG(object):
         out = "Key-Type: %s\n" % parms.pop('Key-Type')
         for key, val in list(parms.items()):
             out += "%s: %s\n" % (key, val)
+        out += "%%pubring %s.pub\n" % self.pubring
+        out += "%%secring %s.pub\n" % self.secring
         out += "%commit\n"
         return out