diff --git a/doc/specs/vulkan/genspec.py b/doc/specs/vulkan/genspec.py
index c8577c65..97cfe877 100755
--- a/doc/specs/vulkan/genspec.py
+++ b/doc/specs/vulkan/genspec.py
@@ -44,30 +44,23 @@ def buildRelease(branch, label, outdir,
           'outdir=' + outdir)
     print('git checkout', branch)
 
-    print('echo Info: Cleaning spec in', outdir)
-    print('cd', specDir)
-    print('rm -rf',
-          outdir + '/man',
-          outdir + '/xhtml',
-          outdir + '/pdf',
-          outdir + '/vkspec.chunked',
-          outdir + '/style',
-          outdir + '/vkspec.html',
-          outdir + '/styleguide.html',
-          outdir + '/apispec.html',
-          outdir + '/apispec.xml',
-          outdir + '/readme.html',
-          outdir + '/config',
-          outdir + '/checks',
-          'specversion.txt')
+    # print('echo Info: Cleaning spec in', outdir)
+    print('(cd ', outdir, '&& rm -rf',
+          'xhtml chunked pdf',
+          'man config checks',
+          'vkspec.html styleguide.html apispec.html apispec.pdf registry.html',
+          ')')
 
-    print('echo Info: Generating headers and spec include files')
+    # print('echo Info: Generating specversion.txt')
+    print('cd', specDir)
+    print('rm specversion.txt ; make specversion.txt')
+
+    # print('echo Info: Generating headers and spec include files')
     print('cd', xmlDir)
     print('make OUTDIR=' + outdir, xmlTargets)
 
-    print('echo Info: Generating spec')
+    # print('echo Info: Generating spec')
     print('cd', specDir)
-    print('make specversion.txt')
     print('make -j 8 OUTDIR=' + outdir, ' NOTEOPTS="-a implementation-guide"',
           specTargets)
 
diff --git a/doc/specs/vulkan/man/VkImageLayout.txt b/doc/specs/vulkan/man/VkImageLayout.txt
index f9e10b8a..1578b385 100644
--- a/doc/specs/vulkan/man/VkImageLayout.txt
+++ b/doc/specs/vulkan/man/VkImageLayout.txt
@@ -70,7 +70,7 @@ The type(s) of device access supported by each layout are:
     destination image of a transfer command. This layout is valid only for
     image subresources of images created with the
     ename:VK_IMAGE_USAGE_TRANSFER_DST_BIT usage bit enabled.
-include::VK_KHR_swapchain/VkImageLayout_swapchain.txt[]
+include::../chapters/VK_KHR_swapchain/VkImageLayout_swapchain.txt[]
 
 For each mechanism of accessing an image in the API, there is a parameter or
 structure member that controls the image layout used to access the image.
diff --git a/doc/specs/vulkan/man/VkResult.txt b/doc/specs/vulkan/man/VkResult.txt
index cf84d0a3..a9be3fa9 100644
--- a/doc/specs/vulkan/man/VkResult.txt
+++ b/doc/specs/vulkan/man/VkResult.txt
@@ -48,7 +48,7 @@ Description
     An event is unsignaled
 * ename:VK_INCOMPLETE
     A return array was too small for the result
-include::VK_KHR_swapchain/VkResultSuccessDescriptions_swapchain.txt[]
+include::../chapters/VK_KHR_swapchain/VkResultSuccessDescriptions_swapchain.txt[]
 
 [[fundamentals-errorcodes]]
 .Error codes
@@ -80,9 +80,9 @@ include::VK_KHR_swapchain/VkResultSuccessDescriptions_swapchain.txt[]
 * ename:VK_ERROR_FRAGMENTED_POOL
     A requested pool allocation has failed due to fragmentation of the
     pool's memory.
-include::VK_KHR_surface/VkResultErrorDescriptions_surface.txt[]
-include::VK_KHR_swapchain/VkResultErrorDescriptions_swapchain.txt[]
-include::VK_KHR_display_swapchain/VkResultErrorDescriptions_display_swapchain.txt[]
+include::../chapters/VK_KHR_surface/VkResultErrorDescriptions_surface.txt[]
+include::../chapters/VK_KHR_swapchain/VkResultErrorDescriptions_swapchain.txt[]
+include::../chapters/VK_KHR_display_swapchain/VkResultErrorDescriptions_display_swapchain.txt[]
 
 If a command returns a run time error, it will leave any result pointers
 unmodified, unless other behavior is explicitly defined in the specification.
diff --git a/doc/specs/vulkan/man/VkWaylandSurfaceCreateInfoKHR.txt b/doc/specs/vulkan/man/VkWaylandSurfaceCreateInfoKHR.txt
index 950568c9..d6f8cc42 100644
--- a/doc/specs/vulkan/man/VkWaylandSurfaceCreateInfoKHR.txt
+++ b/doc/specs/vulkan/man/VkWaylandSurfaceCreateInfoKHR.txt
@@ -16,7 +16,7 @@ C Specification
 
 The sname:VkWaylandSurfaceCreateInfoKHR structure is defined as:
 
-include::../../api/structs/VkWaylandSurfaceCreateInfoKHR.txt[]
+include::../api/structs/VkWaylandSurfaceCreateInfoKHR.txt[]
 
 
 Members
@@ -33,7 +33,7 @@ Members
 Description
 -----------
 
-include::../../validity/structs/VkWaylandSurfaceCreateInfoKHR.txt[]
+include::../validity/structs/VkWaylandSurfaceCreateInfoKHR.txt[]
 
 
 See Also
diff --git a/doc/specs/vulkan/man/vkCreateWaylandSurfaceKHR.txt b/doc/specs/vulkan/man/vkCreateWaylandSurfaceKHR.txt
index 9e998ab6..a0f9f180 100644
--- a/doc/specs/vulkan/man/vkCreateWaylandSurfaceKHR.txt
+++ b/doc/specs/vulkan/man/vkCreateWaylandSurfaceKHR.txt
@@ -16,7 +16,7 @@ C Specification
 
 To create a sname:VkSurfaceKHR object for a Wayland surface, call:
 
-include::../../api/protos/vkCreateWaylandSurfaceKHR.txt[]
+include::../api/protos/vkCreateWaylandSurfaceKHR.txt[]
 
 
 Parameters
@@ -36,7 +36,7 @@ Parameters
 Description
 -----------
 
-include::../../validity/protos/vkCreateWaylandSurfaceKHR.txt[]
+include::../validity/protos/vkCreateWaylandSurfaceKHR.txt[]
 
 
 See Also
diff --git a/doc/specs/vulkan/man/vkGetPhysicalDeviceWaylandPresentationSupportKHR.txt b/doc/specs/vulkan/man/vkGetPhysicalDeviceWaylandPresentationSupportKHR.txt
index 61ff888d..c5e4e21f 100644
--- a/doc/specs/vulkan/man/vkGetPhysicalDeviceWaylandPresentationSupportKHR.txt
+++ b/doc/specs/vulkan/man/vkGetPhysicalDeviceWaylandPresentationSupportKHR.txt
@@ -17,7 +17,7 @@ C Specification
 To determine whether a queue family of a physical device supports presentation
 to a Wayland compositor, call:
 
-include::../../api/protos/vkGetPhysicalDeviceWaylandPresentationSupportKHR.txt[]
+include::../api/protos/vkGetPhysicalDeviceWaylandPresentationSupportKHR.txt[]
 
 
 Parameters
@@ -34,7 +34,7 @@ Description
 
 This platform-specific function can: be called prior to creating a surface.
 
-include::../../validity/protos/vkGetPhysicalDeviceWaylandPresentationSupportKHR.txt[]
+include::../validity/protos/vkGetPhysicalDeviceWaylandPresentationSupportKHR.txt[]
 
 
 See Also