diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py
index a46e5502ab3..5dfd180e7f2 100644
--- a/meta/lib/oe/sstatesig.py
+++ b/meta/lib/oe/sstatesig.py
@@ -147,6 +147,10 @@ class SignatureGeneratorOEBasicHashMixIn(object):
             sigfile = os.getcwd() + "/locked-sigs.inc"
             bb.plain("Writing locked sigs to %s" % sigfile)
             self.dump_lockedsigs(sigfile)
+        if 'unihash-cache-copy' in options:
+            cachefile = os.getcwd() + "/bb_unihashes.dat"
+            bb.plain("Writing unihash cache to %s" % cachefile)
+            bb.parse.siggen.copy_unitaskhashes(os.getcwd())
         return super(bb.siggen.SignatureGeneratorBasicHash, self).dump_sigs(dataCache, options)