--- a/usr/src/cmd/apache2-modperl/Makefile.sfw	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/cmd/apache2-modperl/Makefile.sfw	Sun Dec 20 07:12:51 2009 +0200
@@ -22,9 +22,9 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)Makefile.sfw	1.20	09/08/20 SMI"
+#ident	"@(#)Makefile.sfw	1.21	09/10/20 SMI"
 
-VER=mod_perl-2.0.2
+VER=$(COMPONENT_NAME:sh)-$(COMPONENT_VERSION:sh)
 
 PERL=/usr/perl5/bin/perl
 
@@ -143,8 +143,9 @@
 
 $(VER)/Makefile.PL: $(VER).tar.gz
 	gzip -dc $(VER).tar.gz | tar xopf -
-	gpatch -p0 < CVE-2007-1349.patch
-	gpatch -p0 < CVE-2009-0796.patch
+	(cd $(VER); gpatch -p1 --no-backup-if-mismatch < ../CVE-2009-0796.patch)
+	touch $(VER)/lib/Apache2/Reload.pm
+	gpatch -p0 < Reload.patch
 	touch $(VER)/Makefile.PL
 
 clean: