diff --git a/www/pecl-APC/Makefile b/www/pecl-APC/Makefile
index 50b40dcb912..292ce084116 100644
--- a/www/pecl-APC/Makefile
+++ b/www/pecl-APC/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.13 2008/12/20 01:06:50 sthen Exp $
+# $OpenBSD: Makefile,v 1.14 2009/04/22 21:24:09 jasper Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT=	Alternative PHP Cache
 
-DISTNAME=	APC-3.0.19
-PKGNAME=	pecl-${DISTNAME}p0
+DISTNAME=	APC-3.1.2
+PKGNAME=	pecl-${DISTNAME}
 CATEGORIES=	www
 
 HOMEPAGE=	http://pecl.php.net/package/APC
diff --git a/www/pecl-APC/distinfo b/www/pecl-APC/distinfo
index 242296dd908..6c0a30af597 100644
--- a/www/pecl-APC/distinfo
+++ b/www/pecl-APC/distinfo
@@ -1,5 +1,5 @@
-MD5 (APC-3.0.19.tgz) = lR9D0oc+NXL11a5xqbZvkA==
-RMD160 (APC-3.0.19.tgz) = ecANDkTu4mjo/I7Itm8cT1I5Mg0=
-SHA1 (APC-3.0.19.tgz) = WNkKt1fmBsh4vjRJpzgBaggGHf0=
-SHA256 (APC-3.0.19.tgz) = oCZ3p4hDYdZPvzdFxALypv8xPoF7DQogEKy2TNBSR7A=
-SIZE (APC-3.0.19.tgz) = 115735
+MD5 (APC-3.1.2.tgz) = ChjPFks+BE4n7dTB2MMUXA==
+RMD160 (APC-3.1.2.tgz) = DisETjfhYfpEnV0npyGBIFrffhg=
+SHA1 (APC-3.1.2.tgz) = rr2GawZ3mBTpr1rhaUhoc0fFAFQ=
+SHA256 (APC-3.1.2.tgz) = B4WUrCCOcfRpUpjDLIrBDP70mwnvCESywkJnag6qVF4=
+SIZE (APC-3.1.2.tgz) = 123459
diff --git a/www/pecl-APC/patches/patch-apc_php b/www/pecl-APC/patches/patch-apc_php
index b5cd79846de..d1f15c656e6 100644
--- a/www/pecl-APC/patches/patch-apc_php
+++ b/www/pecl-APC/patches/patch-apc_php
@@ -1,10 +1,11 @@
+$OpenBSD: patch-apc_php,v 1.2 2009/04/22 21:24:09 jasper Exp $
+
 "Get rid of very contrived local-user XSS - can't be triggered from external"
 from upstream CVS
 
-$OpenBSD: patch-apc_php,v 1.1 2008/12/20 01:06:50 sthen Exp $
---- apc.php.orig	Thu May 15 02:45:28 2008
-+++ apc.php	Fri Dec 19 19:29:50 2008
-@@ -59,7 +59,7 @@ function defaults($d,$v) {
+--- apc.php.orig	Fri Dec 12 12:37:26 2008
++++ apc.php	Wed Apr 22 10:32:53 2009
+@@ -61,7 +61,7 @@ function defaults($d,$v) {
  
  // rewrite $PHP_SELF to block XSS attacks
  //
@@ -13,7 +14,7 @@ $OpenBSD: patch-apc_php,v 1.1 2008/12/20 01:06:50 sthen Exp $
  $time = time();
  $host = getenv('HOSTNAME');
  if($host) { $host = '('.$host.')'; }
-@@ -1078,7 +1078,7 @@ EOB;
+@@ -1091,7 +1091,7 @@ EOB;
  		}
  		if (!$AUTHENTICATED) {
  			// hide all path entries if not logged in
@@ -22,7 +23,7 @@ $OpenBSD: patch-apc_php,v 1.1 2008/12/20 01:06:50 sthen Exp $
  		} else {
  			$list[$k.$entry[$fieldname]]=$entry;
  		}
-@@ -1097,9 +1097,10 @@ EOB;
+@@ -1110,9 +1110,10 @@ EOB;
  		$i=0;
  		foreach($list as $k => $entry) {
        if(!$MYREQUEST['SEARCH'] || preg_match($MYREQUEST['SEARCH'], $entry[$fieldname]) != 0) {