diff --git a/devel/pcre/Makefile b/devel/pcre/Makefile
index 31c329bb7efa5..99027d2ea3d0c 100644
--- a/devel/pcre/Makefile
+++ b/devel/pcre/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.61 2011/11/28 16:39:29 wiz Exp $
+# $NetBSD: Makefile,v 1.62 2011/12/15 15:39:21 drochner Exp $
 
-DISTNAME=	pcre-8.20
+DISTNAME=	pcre-8.21
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ \
 		${MASTER_SITE_SOURCEFORGE:=pcre/}
diff --git a/devel/pcre/distinfo b/devel/pcre/distinfo
index c2a8c527b676e..c9e05ed7217af 100644
--- a/devel/pcre/distinfo
+++ b/devel/pcre/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.43 2011/11/28 16:39:29 wiz Exp $
+$NetBSD: distinfo,v 1.44 2011/12/15 15:39:21 drochner Exp $
 
-SHA1 (pcre-8.20.tar.bz2) = 6264472669d8068338cd32128cd4e9742587c676
-RMD160 (pcre-8.20.tar.bz2) = 805cc578019cbf3eba993d3176b78a3193ec16fa
-Size (pcre-8.20.tar.bz2) = 1164103 bytes
-SHA1 (patch-aa) = f64935ca3ff7987f7259fcca44fefdac2c60cd2f
+SHA1 (pcre-8.21.tar.bz2) = 52abf655d94f5208377258ffff27c7b35c53af39
+RMD160 (pcre-8.21.tar.bz2) = e1cbc69618dca2ca4f8e53b6b11ae9ca65f8a802
+Size (pcre-8.21.tar.bz2) = 1174037 bytes
+SHA1 (patch-aa) = 569d204319817c8c478db57ab731fc50bcf5dd53
 SHA1 (patch-ab) = 0da1392febca936ad89a8bda66c7114240a0fe4b
diff --git a/devel/pcre/patches/patch-aa b/devel/pcre/patches/patch-aa
index 887f0b80047e2..57473a95dde24 100644
--- a/devel/pcre/patches/patch-aa
+++ b/devel/pcre/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.13 2011/08/22 12:58:08 wiz Exp $
+$NetBSD: patch-aa,v 1.14 2011/12/15 15:39:21 drochner Exp $
 
 Use pkgsrc's COMPILER_RPATH_FLAG variable, so this works on all pkgsrc platforms.
 
---- pcre-config.in.orig	2007-06-17 16:31:18.000000000 +0000
+--- pcre-config.in.orig	2011-12-07 16:32:02.000000000 +0000
 +++ pcre-config.in
-@@ -12,15 +12,7 @@ if test $# -eq 0; then
+@@ -15,15 +15,7 @@ if test $# -eq 0; then
        exit 1
  fi
  
@@ -19,5 +19,5 @@ Use pkgsrc's COMPILER_RPATH_FLAG variable, so this works on all pkgsrc platforms
 -esac
 +libR=" @COMPILER_RPATH_FLAG@@libdir@"
  
- while test $# -gt 0; do
-   case "$1" in
+ libS=
+ if test @libdir@ != /usr/lib ; then