--- a/Makefile.master	Fri Aug 26 20:31:14 2011 +0900
+++ b/Makefile.master	Thu Aug 25 13:39:34 2011 +0200
@@ -89,6 +89,7 @@
 MV=             /usr/bin/mv -f
 RM=             /usr/bin/rm -f
 GREP=           /usr/bin/grep
+GNU_GREP=       /usr/bin/ggrep
 SED=            /usr/bin/sed
 NAWK=           /usr/bin/nawk
 CP=             /usr/bin/cp -f

--- a/pkg_import/importer.py	Fri Aug 26 20:31:14 2011 +0900
+++ b/pkg_import/importer.py	Thu Aug 25 13:39:34 2011 +0200
@@ -670,6 +670,9 @@
                         d = None # free data
                         os.close(fd)
 
+                        # filter our CDDL header hack (for sure it could be written in better way)
+                        os.system("perl -i -ne 'print unless /CDDL HEADER START/ .. /CDDL HEADER END/' '%s'" % tmp)
+
                         actual_action.data = lambda: open(tmp, "rb")
                         actual_action.attrs["pkg.size"] = a.attrs["pkg.size"]
                         publish_action(t, pkg, actual_action)