diff --git a/vk-generate.py b/vk-generate.py
index 92c3b62..e2f37d9 100755
--- a/vk-generate.py
+++ b/vk-generate.py
@@ -84,6 +84,8 @@
  * limitations under the License.
  *
  * Author: Courtney Goeltzenleuchter <courtney@LunarG.com>
+ * Author: Jon Ashburn <jon@lunarg.com>
+ * Author: Mark Lobodzinski <mark@lunarg.com>
  */"""
 
     def generate_header(self):
@@ -291,9 +293,15 @@
         body.append("LIBRARY " + self.library)
         body.append("EXPORTS")
 
-        for proto in self.exports:
-            if self.library != "VkLayerSwapchain" or proto != "vkEnumerateInstanceExtensionProperties" and proto != "vkEnumerateInstanceLayerProperties":
-                body.append( proto)
+        if self.argv[1] != "all":
+            for proto in self.exports:
+                if self.library != "VkLayerSwapchain" or proto != "vkEnumerateInstanceExtensionProperties" and proto != "vkEnumerateInstanceLayerProperties":
+                    body.append(proto)
+        else:
+            for proto in self.protos:
+                if self.exports and proto.name not in self.exports:
+                    continue
+                body.append("   vk" + proto.name)
 
         return "\n".join(body)