diff --git a/devel/pwlib/Makefile b/devel/pwlib/Makefile
index e083aa22242..565dbd5cf8c 100644
--- a/devel/pwlib/Makefile
+++ b/devel/pwlib/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2008/06/08 02:49:00 robert Exp $
+# $OpenBSD: Makefile,v 1.12 2008/07/01 08:22:12 ajacoutot Exp $
 
 SHARED_ONLY=	Yes
 
@@ -6,7 +6,7 @@ COMMENT=	portable Windows library
 
 V=		1_12_0
 DISTNAME=	ptlib-v${V}
-PKGNAME=	pwlib-${V:S/_/./g}p3
+PKGNAME=	pwlib-${V:S/_/./g}p4
 CATEGORIES=	devel
 
 EXTRACT_SUFX=	-src.tar.gz
diff --git a/devel/pwlib/patches/patch-src_ptlib_unix_config_cxx b/devel/pwlib/patches/patch-src_ptlib_unix_config_cxx
new file mode 100644
index 00000000000..2f3adc9de93
--- /dev/null
+++ b/devel/pwlib/patches/patch-src_ptlib_unix_config_cxx
@@ -0,0 +1,16 @@
+$OpenBSD: patch-src_ptlib_unix_config_cxx,v 1.1 2008/07/01 08:22:12 ajacoutot Exp $
+--- src/ptlib/unix/config.cxx.orig	Fri Oct 19 08:22:32 2007
++++ src/ptlib/unix/config.cxx	Tue Jul  1 10:09:52 2008
+@@ -546,9 +546,10 @@ void PXConfigDictionary::RemoveInstance(PXConfig * ins
+     PINDEX index = GetObjectsIndex(instance);
+     PAssert(index != P_MAX_INDEX, "Cannot find PXConfig instance to remove");
+ 
+-    // decrement the instance count, but don't remove it yet
++    // decrement the instance count and remove it if this was the last instance
+     PFilePath key = GetKeyAt(index);
+-    instance->RemoveInstance(key);
++    if (instance->RemoveInstance(key))
++		RemoveAt(key);
+   }
+ 
+   mutex.Signal();