diff --git a/pmb/build/buildinfo.py b/pmb/build/buildinfo.py
index dd8b9253..02314673 100644
--- a/pmb/build/buildinfo.py
+++ b/pmb/build/buildinfo.py
@@ -40,7 +40,8 @@ def generate(args, apk_path, arch, suffix, apkbuild):
     installed = pmb.chroot.apk.installed(args, suffix)
     relevant = (apkbuild["makedepends"] + [apkbuild["pkgname"], "abuild",
                                            "build-base"])
-    relevant = pmb.parse.depends.recurse(args, relevant, arch, in_aports=False)
+    relevant = pmb.parse.depends.recurse(args, relevant, arch, in_aports=False,
+                                         strict=True)
     for pkgname in relevant:
         if pkgname == apkbuild["pkgname"]:
             continue
diff --git a/pmb/parse/depends.py b/pmb/parse/depends.py
index 878707c0..f42693eb 100644
--- a/pmb/parse/depends.py
+++ b/pmb/parse/depends.py
@@ -101,7 +101,8 @@ def recurse(args, pkgnames, arch=None, in_apkindexes=True, in_aports=True,
 
         # Append to todo/ret
         logging.verbose("-> Depends: " + str(depends))
-        todo += depends
+        if depends:
+            todo += depends
         ret.append(pkgname)
 
     return ret