diff --git a/packages/genodelabs/default.nix b/packages/genodelabs/default.nix
index 11deab8..bab5b30 100644
--- a/packages/genodelabs/default.nix
+++ b/packages/genodelabs/default.nix
@@ -30,7 +30,7 @@ let
       version = upstreamSources.lastModifiedDate;
       src = upstreamSources;
       nativeBuildInputs = [ expect gnumake tcl ];
-      patches = [ ./binary-labels.patch ./label-fail.patch ];
+      patches = [ ./patches/binary-labels.patch ./patches/label-fail.patch ];
       configurePhase = ''
         patchShebangs ./tool
         substituteInPlace repos/base/etc/tools.conf \
@@ -296,7 +296,7 @@ let
         '';
     };
 
-  basePatches = [ ./cxx-align.patch ./core-diag.patch ];
+  basePatches = [ ./patches/cxx-align.patch ./patches/core-diag.patch ];
 
 in makePackages // depotPackages // {
 
diff --git a/packages/genodelabs/depot-targets.nix b/packages/genodelabs/depot-targets.nix
index 597e9b4..a12d806 100644
--- a/packages/genodelabs/depot-targets.nix
+++ b/packages/genodelabs/depot-targets.nix
@@ -31,7 +31,7 @@ in {
     '';
   };
 
-  cached_fs_rom.patches = [ ./cached_fs_rom.patch ];
+  cached_fs_rom.patches = [ ./patches/cached_fs_rom.patch ];
 
   coreutils = {
     enableParallelBuilding = false;
@@ -49,9 +49,9 @@ in {
 
   gpt_write.portInputs = [ jitterentropy ];
 
-  init.patches = [ ./sandbox.patch ./xml-fail.patch ];
+  init.patches = [ ./patches/sandbox.patch ./patches/xml-fail.patch ];
 
-  event_filter.patches = [ ./event_filter.patch ];
+  event_filter.patches = [ ./patches/event_filter.patch ];
 
   intel_fb_drv = {
     BOARD = "pc";
@@ -63,7 +63,7 @@ in {
   libc = {
     buildInputs = [ self.vfs ];
     portInputs = [ libc ];
-    patches = [ ./libc.patch ];
+    patches = [ ./patches/libc.patch ];
   };
 
   libiconv.portInputs = [ libc libiconv ];
@@ -80,7 +80,7 @@ in {
 
   noux.portInputs = [ libc ];
 
-  platform_drv.patches = [ ./platform_drv.patch ];
+  platform_drv.patches = [ ./patches/platform_drv.patch ];
 
   posix = {
     buildInputs = [ self.libc ];
@@ -104,9 +104,9 @@ in {
 
   # The following are tests are patched to exit at completion
 
-  "test-log".patches = [ ./test-log.patch ];
+  "test-log".patches = [ ./patches/test-log.patch ];
 
-  "test-signal".patches = [ ./test-signal.patch ];
+  "test-signal".patches = [ ./patches/test-signal.patch ];
 
   usb_drv.portInputs = [ dde_linux ];
 
@@ -119,10 +119,10 @@ in {
   vfs.outputs = [ "out" "lib" ];
   vfs_audit = { };
   vfs_block = { };
-  vfs_import.patches = [ ./vfs_import.patch ];
+  vfs_import.patches = [ ./patches/vfs_import.patch ];
   vfs_jitterentropy.portInputs = [ jitterentropy libc ];
   vfs_lwip = {
-    patches = [ ./lwip.patch ];
+    patches = [ ./patches/lwip.patch ];
     portInputs = [ lwip ];
   };
   vfs_pipe = { };
@@ -131,7 +131,7 @@ in {
   virtdev_rom = { };
 
   virtio_nic_drv = {
-    patches = [ ./virtio_net.patch ];
+    patches = [ ./patches/virtio_net.patch ];
     postInstall = "mv $out/bin/virtio_*_nic $out/bin/$pname";
   };
 
diff --git a/packages/genodelabs/make-targets.nix b/packages/genodelabs/make-targets.nix
index 07a26e2..f5ac510 100644
--- a/packages/genodelabs/make-targets.nix
+++ b/packages/genodelabs/make-targets.nix
@@ -9,14 +9,14 @@
 
   test-pci = {
     targets = [ "test/pci" ];
-    patches = [ ./test-pci.patch ];
+    patches = [ ./patches/test-pci.patch ];
   };
 
   test-rtc.targets = [ "test/rtc" ];
 
   test-vmm_x86 = {
     targets = [ "test/vmm_x86" ];
-    patches = [ ./test-vmm_x86.patch ];
+    patches = [ ./patches/test-vmm_x86.patch ];
   };
 
 }
diff --git a/packages/genodelabs/binary-labels.patch b/packages/genodelabs/patches/binary-labels.patch
similarity index 100%
rename from packages/genodelabs/binary-labels.patch
rename to packages/genodelabs/patches/binary-labels.patch
diff --git a/packages/genodelabs/cached_fs_rom.patch b/packages/genodelabs/patches/cached_fs_rom.patch
similarity index 100%
rename from packages/genodelabs/cached_fs_rom.patch
rename to packages/genodelabs/patches/cached_fs_rom.patch
diff --git a/packages/genodelabs/core-diag.patch b/packages/genodelabs/patches/core-diag.patch
similarity index 100%
rename from packages/genodelabs/core-diag.patch
rename to packages/genodelabs/patches/core-diag.patch
diff --git a/packages/genodelabs/cxx-align.patch b/packages/genodelabs/patches/cxx-align.patch
similarity index 100%
rename from packages/genodelabs/cxx-align.patch
rename to packages/genodelabs/patches/cxx-align.patch
diff --git a/packages/genodelabs/event_filter.patch b/packages/genodelabs/patches/event_filter.patch
similarity index 100%
rename from packages/genodelabs/event_filter.patch
rename to packages/genodelabs/patches/event_filter.patch
diff --git a/packages/genodelabs/gcc-port.patch b/packages/genodelabs/patches/gcc-port.patch
similarity index 100%
rename from packages/genodelabs/gcc-port.patch
rename to packages/genodelabs/patches/gcc-port.patch
diff --git a/packages/genodelabs/label-fail.patch b/packages/genodelabs/patches/label-fail.patch
similarity index 100%
rename from packages/genodelabs/label-fail.patch
rename to packages/genodelabs/patches/label-fail.patch
diff --git a/packages/genodelabs/libc.patch b/packages/genodelabs/patches/libc.patch
similarity index 100%
rename from packages/genodelabs/libc.patch
rename to packages/genodelabs/patches/libc.patch
diff --git a/packages/genodelabs/lwip.patch b/packages/genodelabs/patches/lwip.patch
similarity index 100%
rename from packages/genodelabs/lwip.patch
rename to packages/genodelabs/patches/lwip.patch
diff --git a/packages/genodelabs/platform_drv.patch b/packages/genodelabs/patches/platform_drv.patch
similarity index 100%
rename from packages/genodelabs/platform_drv.patch
rename to packages/genodelabs/patches/platform_drv.patch
diff --git a/packages/genodelabs/sandbox.patch b/packages/genodelabs/patches/sandbox.patch
similarity index 100%
rename from packages/genodelabs/sandbox.patch
rename to packages/genodelabs/patches/sandbox.patch
diff --git a/packages/genodelabs/svn-trust-server-cert.patch b/packages/genodelabs/patches/svn-trust-server-cert.patch
similarity index 100%
rename from packages/genodelabs/svn-trust-server-cert.patch
rename to packages/genodelabs/patches/svn-trust-server-cert.patch
diff --git a/packages/genodelabs/test-log.patch b/packages/genodelabs/patches/test-log.patch
similarity index 100%
rename from packages/genodelabs/test-log.patch
rename to packages/genodelabs/patches/test-log.patch
diff --git a/packages/genodelabs/test-pci.patch b/packages/genodelabs/patches/test-pci.patch
similarity index 100%
rename from packages/genodelabs/test-pci.patch
rename to packages/genodelabs/patches/test-pci.patch
diff --git a/packages/genodelabs/test-signal.patch b/packages/genodelabs/patches/test-signal.patch
similarity index 100%
rename from packages/genodelabs/test-signal.patch
rename to packages/genodelabs/patches/test-signal.patch
diff --git a/packages/genodelabs/test-vmm_x86.patch b/packages/genodelabs/patches/test-vmm_x86.patch
similarity index 100%
rename from packages/genodelabs/test-vmm_x86.patch
rename to packages/genodelabs/patches/test-vmm_x86.patch
diff --git a/packages/genodelabs/vfs_import.patch b/packages/genodelabs/patches/vfs_import.patch
similarity index 100%
rename from packages/genodelabs/vfs_import.patch
rename to packages/genodelabs/patches/vfs_import.patch
diff --git a/packages/genodelabs/virtio_net.patch b/packages/genodelabs/patches/virtio_net.patch
similarity index 100%
rename from packages/genodelabs/virtio_net.patch
rename to packages/genodelabs/patches/virtio_net.patch
diff --git a/packages/genodelabs/xml-fail.patch b/packages/genodelabs/patches/xml-fail.patch
similarity index 100%
rename from packages/genodelabs/xml-fail.patch
rename to packages/genodelabs/patches/xml-fail.patch
diff --git a/packages/genodelabs/ports.nix b/packages/genodelabs/ports.nix
index 83e65c8..1507fd6 100644
--- a/packages/genodelabs/ports.nix
+++ b/packages/genodelabs/ports.nix
@@ -20,13 +20,13 @@ with pkgs;
   dde_rump = {
     hash = "sha256-Wr5otGkWEa+5xImsFHQzwap5LckNEbyWA/7xbNcOreI=";
     nativeBuildInputs = [ subversion ];
-    patches = [ ./svn-trust-server-cert.patch ];
+    patches = [ ./patches/svn-trust-server-cert.patch ];
   };
   expat.hash = "sha256-KpeM2ySmf+Ojx1mAj9n8lfX7iHaa7w5MPPKZcn4GpTc=";
   gcc = {
     hash = "sha256-1AKjUbh8X5ips8pg0twpBTtc2qCVXGrbifJ/cf3yRcE=";
     nativeBuildInputs = [ autoconf264 autogen ];
-    patches = [ ./gcc-port.patch ];
+    patches = [ ./patches/gcc-port.patch ];
   };
   gdb.hash = "sha256-YfVWDdXSRt7rHMvlMxIL5ikbHDe/e6ryTt3V7FfsJ4M=";
   gmp.hash = "sha256-ZOHMhhqMe8glpMEGg++uDjCxXksAXDiBKCchEPQKTCA=";