diff --git a/src/ostbuild/pyostbuild/builtin_git_mirror.py b/src/ostbuild/pyostbuild/builtin_git_mirror.py
index 34e23946..9c64d411 100755
--- a/src/ostbuild/pyostbuild/builtin_git_mirror.py
+++ b/src/ostbuild/pyostbuild/builtin_git_mirror.py
@@ -52,6 +52,8 @@ class OstbuildGitMirror(builtins.Builtin):
             components = []
             for component in self.snapshot['components']:
                 components.append(component['name'])
+            if 'patches' in self.snapshot:
+                components.append(self.snapshot['patches']['name'])
             if args.start_at:
                 idx = components.index(args.start_at)
                 components = components[idx:]
diff --git a/src/ostbuild/pyostbuild/builtins.py b/src/ostbuild/pyostbuild/builtins.py
index 4bcc7337..b5fd1043 100755
--- a/src/ostbuild/pyostbuild/builtins.py
+++ b/src/ostbuild/pyostbuild/builtins.py
@@ -135,6 +135,10 @@ class Builtin(object):
         else:
             target_snapshot = in_snapshot
         component = self.find_component_in_snapshot(name, target_snapshot)
+        if (component is None and 
+            'patches' in self.snapshot and
+            self.snapshot['patches']['name'] == name):
+            return self.snapshot['patches']
         if component is None:
             fatal("Couldn't find component '%s' in manifest" % (name, ))
         return component