diff --git a/mail/pantomime/Makefile b/mail/pantomime/Makefile
index 7956d35946fa..a1f1a3a83deb 100644
--- a/mail/pantomime/Makefile
+++ b/mail/pantomime/Makefile
@@ -25,4 +25,8 @@ USE_GNUSTEP_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
 
 DEFAULT_LIBVERSION=	1.2
 
+.if !defined(WITH_GNUSTEP_DEVEL)
+EXTRA_PATCHES=	${FILESDIR}/NSString+Extensions.m.patch
+.endif
+
 .include <bsd.port.mk>
diff --git a/mail/pantomime/files/NSString+Extensions.m.patch b/mail/pantomime/files/NSString+Extensions.m.patch
new file mode 100644
index 000000000000..a98522cf83d4
--- /dev/null
+++ b/mail/pantomime/files/NSString+Extensions.m.patch
@@ -0,0 +1,19 @@
+--- Framework/Pantomime/NSString+Extensions.m.orig	2011-06-05 06:45:21.000000000 +0200
++++ Framework/Pantomime/NSString+Extensions.m	2012-01-02 22:46:00.000000000 +0100
+@@ -38,7 +38,15 @@
+ #include <CoreFoundation/CFString.h>
+ #include <CoreFoundation/CFStringEncodingExt.h>
+ #else
+-#include <GNUstepBase/Additions.h>
++#import	<GNUstepBase/GSVersionMacros.h>
++#import	<GNUstepBase/GNUstep.h>
++
++#import	<GNUstepBase/GSFunctions.h>
++#import	<GNUstepBase/GSLocale.h>
++#import	<GNUstepBase/GSLock.h>
++#import	<GNUstepBase/GSMime.h>
++#import	<GNUstepBase/GSXML.h>
++#import	<GNUstepBase/Unicode.h>
+ #endif
+ 
+ #include <ctype.h>