diff --git a/www/p5-CGI-SpeedyCGI/Makefile b/www/p5-CGI-SpeedyCGI/Makefile
index bfb39de680f..71c5d95efd8 100644
--- a/www/p5-CGI-SpeedyCGI/Makefile
+++ b/www/p5-CGI-SpeedyCGI/Makefile
@@ -1,11 +1,13 @@
-# $OpenBSD: Makefile,v 1.6 2007/09/15 20:38:23 merdely Exp $
+# $OpenBSD: Makefile,v 1.7 2007/11/08 06:43:47 jakob Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT=	speed up perl scripts by running them persistently
 
 MODULES=	cpan
-DISTNAME=	CGI-SpeedyCGI-2.22
+VERSION=	2.22
+DISTNAME=	CGI-SpeedyCGI-${VERSION}
+PKGNAME=	p5-CGI-SpeedyCGI-${VERSION}p0
 CATEGORIES=	www
 
 HOMEPAGE=	http://daemoninc.com/SpeedyCGI/
@@ -21,6 +23,12 @@ WANTLIB=		c m perl util
 
 NO_REGRESS=		Yes
 
+post-patch:
+	@cp ${WRKSRC}/src/optdefs ${WRKSRC}/src/optdefs.orig
+	@sed 's,!!PREFIX!!,${PREFIX},' \
+		< ${WRKSRC}/src/optdefs.orig \
+		> ${WRKSRC}/src/optdefs
+
 post-build:
 	@sed 's,!!PREFIX!!,${PREFIX},' \
 		< ${FILESDIR}/mod_speedycgi-enable \
diff --git a/www/p5-CGI-SpeedyCGI/patches/patch-src_optdefs b/www/p5-CGI-SpeedyCGI/patches/patch-src_optdefs
new file mode 100644
index 00000000000..d64973aeaff
--- /dev/null
+++ b/www/p5-CGI-SpeedyCGI/patches/patch-src_optdefs
@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_optdefs,v 1.1 2007/11/08 06:43:47 jakob Exp $
+--- src/optdefs.orig	Tue Oct  7 06:03:48 2003
++++ src/optdefs	Wed Nov  7 09:01:28 2007
+@@ -63,7 +63,7 @@ option	BackendProg
+ type	str
+ letter	p
+ context	frontend
+-defval	$INSTALLBIN/speedy_backend
++defval	!!PREFIX!!/bin/speedy_backend
+ desc	Path to the speedy backend program.
+ 
+ option	TmpBase