3 files changed, 8 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index fe0aa604..cb19e8ae 100644
--- a/Makefile
+++ b/Makefile
@@ -47,6 +47,7 @@ dis: clean
 	rm -rf $(NAME)-$(VERSION) ../$(NAME)-$(VERSION).tar*
 	svn export -q -rBASE . $(NAME)-$(VERSION)
 	find $(NAME)-$(VERSION) -name .svnignore |xargs rm -rf
+	find $(NAME)-$(VERSION) -name '*.pm' -o -name rpmdrake -o -name MandrivaUpdate | xargs ./simplify-drakx-modules
 	tar cfY ../$(NAME)-$(VERSION).tar.lzma $(NAME)-$(VERSION)
 	rm -rf $(NAME)-$(VERSION)
 
diff --git a/NEWS b/NEWS
index aa62e025..468c11f6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- drop diagnostics, strict, vars and warnings pragmas (should help #45361)
+
 Version 5.2.1 - 6 October 2008, Thierry Vignaud
 
 - fix displaying big list of conflicting packages
diff --git a/simplify-drakx-modules b/simplify-drakx-modules
new file mode 100755
index 00000000..ec8df1e7
--- /dev/null
+++ b/simplify-drakx-modules
@@ -0,0 +1,5 @@
+#!/usr/bin/perl -pi
+
+s/^\s*use\s+(diagnostics|strict|vars|warnings).*//g;
+
+/^__END__/ and $_ = '', close ARGV;