diff --git a/x11/gnustep/pantomime/Makefile b/x11/gnustep/pantomime/Makefile
index 26fdf2a0ca9..a0adddd9d82 100644
--- a/x11/gnustep/pantomime/Makefile
+++ b/x11/gnustep/pantomime/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.7 2010/11/22 08:36:59 espie Exp $
+# $OpenBSD: Makefile,v 1.8 2011/04/18 12:37:17 sebastia Exp $
 
 COMMENT=	framework to major mail protocols
 
 DISTNAME=	Pantomime-1.2.0pre3
 PKGNAME=	${DISTNAME:L}
-REVISION=	3
+REVISION=	4
 
 SHARED_LIBS=	Pantomime 1.2	# .1.2
 CATEGORIES=	mail
@@ -22,6 +22,8 @@ BUILD_DEPENDS=	x11/gnustep/base
 
 WRKDIST=	${WRKDIR}/Pantomime
 
+MAKE_FLAGS +=	Pantomime_INTERFACE_VERSION=${LIBPantomime_VERSION}
+
 pre-configure:
 	@perl -pi -e 's,^PANTOMIME_MAJOR_VERSION=.*,PANTOMIME_MAJOR_VERSION=${LIBPantomime_VERSION:R},g;' \
 		-e 's,^PANTOMIME_MINOR_VERSION=.*,PANTOMIME_MINOR_VERSION=${LIBPantomime_VERSION:E},g' \
diff --git a/x11/gnustep/pantomime/patches/patch-Framework_Pantomime_GNUmakefile b/x11/gnustep/pantomime/patches/patch-Framework_Pantomime_GNUmakefile
deleted file mode 100644
index 2199377994a..00000000000
--- a/x11/gnustep/pantomime/patches/patch-Framework_Pantomime_GNUmakefile
+++ /dev/null
@@ -1,15 +0,0 @@
-$OpenBSD: patch-Framework_Pantomime_GNUmakefile,v 1.1.1.1 2007/07/29 14:15:31 ajacoutot Exp $
---- Framework/Pantomime/GNUmakefile.orig	Sat Apr 29 19:06:27 2006
-+++ Framework/Pantomime/GNUmakefile	Wed May 16 12:43:50 2007
-@@ -26,9 +26,9 @@ FRAMEWORK_NAME = Pantomime
- PANTOMIME_MAJOR_VERSION=1
- PANTOMIME_MINOR_VERSION=2
- PANTOMIME_SUBMINOR_VERSION=0
--PANTOMIME_VERSION=${PANTOMIME_MAJOR_VERSION}.${PANTOMIME_MINOR_VERSION}.${PANTOMIME_SUBMINOR_VERSION}
-+PANTOMIME_VERSION=${PANTOMIME_MAJOR_VERSION}.${PANTOMIME_MINOR_VERSION}
- VERSION=${PANTOMIME_VERSION}
--Pantomime_INTERFACE_VERSION=1.2
-+Pantomime_INTERFACE_VERSION=${PANTOMIME_MAJOR_VERSION}.${PANTOMIME_MINOR_VERSION}
- 
- # C sources files to be compiled
- Pantomime_C_FILES = \
diff --git a/x11/gnustep/pantomime/patches/patch-Framework_Pantomime_NSString+Extensions_m b/x11/gnustep/pantomime/patches/patch-Framework_Pantomime_NSString+Extensions_m
new file mode 100644
index 00000000000..970d3a7c1a8
--- /dev/null
+++ b/x11/gnustep/pantomime/patches/patch-Framework_Pantomime_NSString+Extensions_m
@@ -0,0 +1,17 @@
+$OpenBSD: patch-Framework_Pantomime_NSString+Extensions_m,v 1.1 2011/04/18 12:37:17 sebastia Exp $
+
+do not try to include nonexistent header file
+
+--- Framework/Pantomime/NSString+Extensions.m.orig	Wed Apr  6 14:34:34 2011
++++ Framework/Pantomime/NSString+Extensions.m	Wed Apr  6 14:35:13 2011
+@@ -42,8 +42,8 @@
+ #ifdef MACOSX
+ #include <CoreFoundation/CFString.h>
+ #include <CoreFoundation/CFStringEncodingExt.h>
+-#else
+-#include <GNUstepBase/GSCategories.h>
++//#else
++//#include <GNUstepBase/GSCategories.h>
+ #endif
+ 
+ #include <ctype.h>
diff --git a/x11/gnustep/pantomime/patches/patch-Framework_Pantomime_io_c b/x11/gnustep/pantomime/patches/patch-Framework_Pantomime_io_c
new file mode 100644
index 00000000000..3064d46a0d7
--- /dev/null
+++ b/x11/gnustep/pantomime/patches/patch-Framework_Pantomime_io_c
@@ -0,0 +1,14 @@
+$OpenBSD: patch-Framework_Pantomime_io_c,v 1.1 2011/04/18 12:37:17 sebastia Exp $
+
+fix implicit declaration of abort
+
+--- Framework/Pantomime/io.c.orig	Fri Apr 15 13:24:53 2011
++++ Framework/Pantomime/io.c	Fri Apr 15 13:25:49 2011
+@@ -31,6 +31,7 @@
+ #include <sys/socket.h>
+ #endif
+ 
++#include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>     // For memset()
+ #include <netinet/in.h> // For ntohs() and friends. 
diff --git a/x11/gnustep/pantomime/pkg/PLIST b/x11/gnustep/pantomime/pkg/PLIST
index 38c151ab48f..0a3230d9044 100644
--- a/x11/gnustep/pantomime/pkg/PLIST
+++ b/x11/gnustep/pantomime/pkg/PLIST
@@ -1,9 +1,10 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2007/07/29 14:15:31 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.2 2011/04/18 12:37:17 sebastia Exp $
 include/Pantomime
 lib/GNUstep/
 lib/GNUstep/Frameworks/
 lib/GNUstep/Frameworks/Pantomime.framework/
 lib/GNUstep/Frameworks/Pantomime.framework/Headers
+lib/GNUstep/Frameworks/Pantomime.framework/Pantomime
 lib/GNUstep/Frameworks/Pantomime.framework/Resources
 lib/GNUstep/Frameworks/Pantomime.framework/Versions/
 lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/
@@ -76,6 +77,7 @@ lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/NSScanner+Extens
 lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/NSString+Extensions.h
 lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/Pantomime.h
 lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/io.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Pantomime
 lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Resources/
 lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Resources/English.lproj/
 lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Resources/English.lproj/InfoPlist.strings
@@ -84,10 +86,12 @@ lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Resources/German.lproj/
 lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Resources/German.lproj/InfoPlist.strings
 lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Resources/German.lproj/Localizable.strings
 lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Resources/Info-gnustep.plist
+@lib lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/libPantomime.so.${LIBPantomime_VERSION}
 lib/GNUstep/Frameworks/Pantomime.framework/Versions/Current
 lib/GNUstep/Frameworks/Pantomime.framework/Versions/Resources/
 lib/GNUstep/Frameworks/Pantomime.framework/Versions/Resources/English.lproj/
 lib/GNUstep/Frameworks/Pantomime.framework/Versions/Resources/English.lproj/Localizable.strings
 lib/GNUstep/Frameworks/Pantomime.framework/Versions/Resources/German.lproj/
 lib/GNUstep/Frameworks/Pantomime.framework/Versions/Resources/German.lproj/Localizable.strings
+@lib lib/GNUstep/Frameworks/Pantomime.framework/libPantomime.so.${LIBPantomime_VERSION}
 @lib lib/libPantomime.so.${LIBPantomime_VERSION}