diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 10c2f0a..231b01b 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -988,10 +988,19 @@ 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" 
+		if "installed_vs_shipped" in = (d.getVar('INSANE_SKIP_' + pn, True) or "").split()
+			bb.note("Package %s skipping Packging installed vs shipped QA test" % pn) 
+			continue
+		if "installed_vs_shipped" in (d.getVar("ERROR_QA", True) or "").split():
+			package_qa_handle_error("installed_vs_shipped", msg, d)
+			for f in unshipped:
+				package_qa_handle_error("installed_vs_shipped", "  " + f, d)
+		else:
+			bb.warn("For recipe %s, the following files/directories were installed but
+			for f in unshipped:
+				bb.warn("  " + f)
+ 
 	bb.build.exec_func("package_name_hook", d)
 
 	for pkg in package_list: