diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 0b98c6b..ff2ec96 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -988,9 +988,14 @@ python populate_packages () {
 				unshipped.append(path)
 
 	if unshipped != []:
-		bb.warn("For recipe %s, the following files/directories were installed but not shipped in any package:" % pn)
-		for f in unshipped:
-			bb.warn("  " + f)
+		msg = pn + ": Files/directories were installed but not shipped" 
+		skip = (d.getVar('INSANE_SKIP_' + pn, True) or "").split()
+		if "installed_vs_shipped" in skip:
+			bb.note("Package %s skipping QA tests: installed_vs_shipped" % pn)
+		else:
+			package_qa_handle_error("installed_vs_shipped", msg, d)
+			for f in unshipped:
+				package_qa_handle_error("installed_vs_shipped", "  " + f, d)
 
 	bb.build.exec_func("package_name_hook", d)