diff --git a/x11/gnustep/base/Makefile b/x11/gnustep/base/Makefile
index 1ba965c0474..d636999d4b9 100644
--- a/x11/gnustep/base/Makefile
+++ b/x11/gnustep/base/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.37 2011/04/18 11:54:49 sebastia Exp $
+# $OpenBSD: Makefile,v 1.38 2011/05/24 13:58:28 sebastia Exp $
 
 COMMENT=	GNUstep base library
 
 DISTNAME=	gnustep-base-1.22.0
+REVISION =	0
 
 SHARED_LIBS=	gnustep-base 4.0
 CATEGORIES=	devel
diff --git a/x11/gnustep/base/patches/patch-Source_NSBundle_m b/x11/gnustep/base/patches/patch-Source_NSBundle_m
new file mode 100644
index 00000000000..c685d2fabbd
--- /dev/null
+++ b/x11/gnustep/base/patches/patch-Source_NSBundle_m
@@ -0,0 +1,19 @@
+$OpenBSD: patch-Source_NSBundle_m,v 1.1 2011/05/24 13:58:28 sebastia Exp $
+
+Fix lookup of bundles for application, from upstream
+
+--- Source/NSBundle.m.orig	Mon Apr  4 12:57:49 2011
++++ Source/NSBundle.m	Mon May 23 12:57:51 2011
+@@ -287,7 +287,11 @@ GSPrivateExecutablePath()
+ 	    {
+ 	      executablePath = AbsolutePathOfExecutable(executablePath, YES);
+ 	    }
+-
++	  else
++	    {
++	      executablePath = [executablePath stringByResolvingSymlinksInPath];
++	      executablePath = [executablePath stringByStandardizingPath];
++	    }
+ 	  IF_NO_GC([executablePath retain];)
+ 	  beenHere = YES;
+ 	}
diff --git a/x11/gnustep/base/patches/patch-Source_NSData_m b/x11/gnustep/base/patches/patch-Source_NSData_m
index 19cdae5d7af..c183291bd61 100644
--- a/x11/gnustep/base/patches/patch-Source_NSData_m
+++ b/x11/gnustep/base/patches/patch-Source_NSData_m
@@ -1,7 +1,7 @@
-$OpenBSD: patch-Source_NSData_m,v 1.1 2011/04/18 11:54:49 sebastia Exp $
---- Source/NSData.m.orig	Mon Apr  4 17:07:33 2011
-+++ Source/NSData.m	Mon Apr  4 17:09:49 2011
-@@ -3108,7 +3108,7 @@ getBytes(void* dst, void* src, unsigned len, unsigned 
+$OpenBSD: patch-Source_NSData_m,v 1.2 2011/05/24 13:58:28 sebastia Exp $
+--- Source/NSData.m.orig	Tue Apr  5 14:12:34 2011
++++ Source/NSData.m	Mon May 23 12:57:03 2011
+@@ -3109,7 +3109,7 @@ getBytes(void* dst, void* src, unsigned len, unsigned 
        shmid = shmget(IPC_PRIVATE, bufferSize, IPC_CREAT|VM_RDONLY);
        if (shmid == -1)			/* Created memory? */
  	{
@@ -10,7 +10,7 @@ $OpenBSD: patch-Source_NSData_m,v 1.1 2011/04/18 11:54:49 sebastia Exp $
  	    bufferSize, [NSError _last]);
  	  DESTROY(self);
  	  self = [dataMalloc allocWithZone: NSDefaultMallocZone()];
-@@ -3118,7 +3118,7 @@ getBytes(void* dst, void* src, unsigned len, unsigned 
+@@ -3119,7 +3119,7 @@ getBytes(void* dst, void* src, unsigned len, unsigned 
      bytes = shmat(shmid, 0, 0);
      if (bytes == (void*)-1)
        {
@@ -19,7 +19,7 @@ $OpenBSD: patch-Source_NSData_m,v 1.1 2011/04/18 11:54:49 sebastia Exp $
  	  bufferSize, [NSError _last]);
  	bytes = 0;
  	DESTROY(self);
-@@ -3298,7 +3298,7 @@ getBytes(void* dst, void* src, unsigned len, unsigned 
+@@ -3299,7 +3299,7 @@ getBytes(void* dst, void* src, unsigned len, unsigned 
        if (bytes == 0)
  	{
  	  NSLog(@"[NSMutableDataMalloc -initWithCapacity:] out of memory "
@@ -28,7 +28,7 @@ $OpenBSD: patch-Source_NSData_m,v 1.1 2011/04/18 11:54:49 sebastia Exp $
  	  DESTROY(self);
  	  return nil;
  	}
-@@ -3842,7 +3842,7 @@ getBytes(void* dst, void* src, unsigned len, unsigned 
+@@ -3843,7 +3843,7 @@ getBytes(void* dst, void* src, unsigned len, unsigned 
    if (shmid == -1)			/* Created memory? */
      {
        NSLog(@"[NSMutableDataShared -initWithCapacity:] shared memory "
@@ -37,7 +37,7 @@ $OpenBSD: patch-Source_NSData_m,v 1.1 2011/04/18 11:54:49 sebastia Exp $
        DESTROY(self);
        self = [mutableDataMalloc allocWithZone: NSDefaultMallocZone()];
        return [self initWithCapacity: bufferSize];
-@@ -3852,7 +3852,7 @@ getBytes(void* dst, void* src, unsigned len, unsigned 
+@@ -3853,7 +3853,7 @@ getBytes(void* dst, void* src, unsigned len, unsigned 
    if (bytes == (void*)-1)
      {
        NSLog(@"[NSMutableDataShared -initWithCapacity:] shared memory "
diff --git a/x11/gnustep/base/patches/patch-Source_NSObject_m b/x11/gnustep/base/patches/patch-Source_NSObject_m
index 0061eddccbd..9d2beddcab0 100644
--- a/x11/gnustep/base/patches/patch-Source_NSObject_m
+++ b/x11/gnustep/base/patches/patch-Source_NSObject_m
@@ -1,12 +1,12 @@
-$OpenBSD: patch-Source_NSObject_m,v 1.9 2011/04/18 11:54:49 sebastia Exp $
+$OpenBSD: patch-Source_NSObject_m,v 1.10 2011/05/24 13:58:28 sebastia Exp $
 
 fix building with clang, not needed yet, but to not forget about it
 
---- Source/NSObject.m.orig	Sun Apr  3 10:53:10 2011
-+++ Source/NSObject.m	Mon Apr  4 17:16:24 2011
-@@ -945,7 +947,7 @@ objc_create_block_classes_as_subclasses_of(Class super
+--- Source/NSObject.m.orig	Thu Apr 14 14:36:06 2011
++++ Source/NSObject.m	Mon May 23 12:57:03 2011
+@@ -955,7 +955,7 @@ objc_create_block_classes_as_subclasses_of(Class super
+       finalize_sel = @selector(finalize);
        finalize_imp = class_getMethodImplementation(self, finalize_sel);
- #endif
  
 -#if (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__i386__)
 +#if defined(__FreeBSD__) && defined(__i386__)