diff --git a/x11/gnustep/gui/Makefile b/x11/gnustep/gui/Makefile
index 12b51af6057..220370ff875 100644
--- a/x11/gnustep/gui/Makefile
+++ b/x11/gnustep/gui/Makefile
@@ -1,10 +1,9 @@
-# $OpenBSD: Makefile,v 1.5 2007/12/10 16:24:19 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.6 2008/01/09 14:19:52 ajacoutot Exp $
 
 COMMENT=	GNUstep gui library
 
-DISTNAME=	gnustep-gui-0.12.0
-PKGNAME=	${DISTNAME}p1
-SHARED_LIBS=	gnustep-gui 0.12	# .0.12
+DISTNAME=	gnustep-gui-0.12.1
+SHARED_LIBS=	gnustep-gui 0.12	# .0.12.1
 CATEGORIES=	devel
 
 HOMEPAGE=	http://www.gnustep.org/
diff --git a/x11/gnustep/gui/distinfo b/x11/gnustep/gui/distinfo
index 18014bdda8d..d82ba6eafe6 100644
--- a/x11/gnustep/gui/distinfo
+++ b/x11/gnustep/gui/distinfo
@@ -1,5 +1,5 @@
-MD5 (gnustep/gnustep-gui-0.12.0.tar.gz) = E/HsmRCpkQXtDx958v8tsA==
-RMD160 (gnustep/gnustep-gui-0.12.0.tar.gz) = iGg51gBl27WY2a7+2SmoIKC13DY=
-SHA1 (gnustep/gnustep-gui-0.12.0.tar.gz) = 8+vCgYHbWjB4jM/FR0BKb1LEn9A=
-SHA256 (gnustep/gnustep-gui-0.12.0.tar.gz) = B/x077LbI6RJkomqaQdU1TPBmJdoEVKt2ToHTAX9im4=
-SIZE (gnustep/gnustep-gui-0.12.0.tar.gz) = 1738576
+MD5 (gnustep/gnustep-gui-0.12.1.tar.gz) = KyCJC2wphQBzMXILF5CS4Q==
+RMD160 (gnustep/gnustep-gui-0.12.1.tar.gz) = wM4a1bhTgxVavzCbVvTZTeqNTL4=
+SHA1 (gnustep/gnustep-gui-0.12.1.tar.gz) = 90Uta5WTVcQYleWoRnjq+wfb0j0=
+SHA256 (gnustep/gnustep-gui-0.12.1.tar.gz) = fnwujCubZ4Ua0m5XX7yGa4HPX/jCqEwegrE1aUE75vA=
+SIZE (gnustep/gnustep-gui-0.12.1.tar.gz) = 1739779
diff --git a/x11/gnustep/gui/patches/patch-Source_NSFont_m b/x11/gnustep/gui/patches/patch-Source_NSFont_m
index 8e838841b8e..0b08d965ecb 100644
--- a/x11/gnustep/gui/patches/patch-Source_NSFont_m
+++ b/x11/gnustep/gui/patches/patch-Source_NSFont_m
@@ -1,7 +1,7 @@
-$OpenBSD: patch-Source_NSFont_m,v 1.1.1.1 2007/05/29 03:02:10 ajacoutot Exp $
---- Source/NSFont.m.orig	Mon May 28 14:37:58 2007
-+++ Source/NSFont.m	Mon May 28 14:39:49 2007
-@@ -163,13 +163,13 @@ keyForFont(NSString *name, const float *matrix, BOOL f
+$OpenBSD: patch-Source_NSFont_m,v 1.2 2008/01/09 14:19:52 ajacoutot Exp $
+--- Source/NSFont.m.orig	Thu Dec 27 17:28:44 2007
++++ Source/NSFont.m	Wed Jan  9 15:07:40 2008
+@@ -164,13 +164,13 @@ keyForFont(NSString *name, const float *matrix, BOOL f
    <list>
      <item>NSBoldFontSize            (none)</item>
      <item>NSControlContentFontSize  (none)</item>
@@ -17,7 +17,7 @@ $OpenBSD: patch-Source_NSFont_m,v 1.1.1.1 2007/05/29 03:02:10 ajacoutot Exp $
      <item>NSTitleBarFontSize        (none)</item>
      <item>NSToolTipsFontSize        (none)</item>
      <item>NSUserFixedPitchFontSize  (none)</item>
-@@ -587,7 +587,7 @@ static void setNSFont(NSString *key, NSFont *font)
+@@ -588,7 +588,7 @@ static void setNSFont(NSString *key, NSFont *font)
    
    if (fontSize == 0)
      {
@@ -26,7 +26,7 @@ $OpenBSD: patch-Source_NSFont_m,v 1.1.1.1 2007/05/29 03:02:10 ajacoutot Exp $
      }
  
    return fontSize;
-@@ -599,7 +599,7 @@ static void setNSFont(NSString *key, NSFont *font)
+@@ -600,7 +600,7 @@ static void setNSFont(NSString *key, NSFont *font)
    
    if (fontSize == 0)
      {