diff --git a/x11/gnustep/examples/Makefile b/x11/gnustep/examples/Makefile
index 902f0b00854..1bbb742fc77 100644
--- a/x11/gnustep/examples/Makefile
+++ b/x11/gnustep/examples/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2007/05/29 03:03:52 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.2 2007/06/04 11:09:12 ajacoutot Exp $
 
 COMMENT=	"GNUstep example applications"
 
 DISTNAME=	gnustep-examples-1.2.0
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	misc
 
 HOMEPAGE=	http://www.gnustep.org/experience/examples.html
@@ -19,5 +20,7 @@ RUN_DEPENDS=	:gnustep-back-*:x11/gnustep/back
 pre-configure:
 	@perl -pi -e 's,!!X11BASE!!,${X11BASE},g' \
 		${WRKSRC}/gui/MyGL/GNUmakefile
+	@perl -pi -e 's,!!PREFIX!!,${PREFIX},g' \
+		${WRKSRC}/gui/MyGL/AppController.m
 
 .include <bsd.port.mk>
diff --git a/x11/gnustep/examples/patches/patch-gui_MyGL_AppController_m b/x11/gnustep/examples/patches/patch-gui_MyGL_AppController_m
new file mode 100644
index 00000000000..f8899c8ab39
--- /dev/null
+++ b/x11/gnustep/examples/patches/patch-gui_MyGL_AppController_m
@@ -0,0 +1,12 @@
+$OpenBSD: patch-gui_MyGL_AppController_m,v 1.1 2007/06/04 11:09:13 ajacoutot Exp $
+--- gui/MyGL/AppController.m.orig	Sun Jun  3 15:47:05 2007
++++ gui/MyGL/AppController.m	Sun Jun  3 15:47:48 2007
+@@ -418,7 +418,7 @@ static char initialized = 0;
+ 
+ 	h = [MySAX new];
+ 	p = [GSXMLParser parserWithSAXHandler:h
+-					   withContentsOfFile:@"girl.dae"];
++					   withContentsOfFile:@"!!PREFIX!!/libexec/GNUstep/MyGL.app/Resources/girl.dae"];
+ 	if ([p parse])
+ 	{
+ 		[meshArray addObject:[h currentMesh]];
diff --git a/x11/gnustep/examples/patches/patch-gui_MyGL_GNUmakefile b/x11/gnustep/examples/patches/patch-gui_MyGL_GNUmakefile
index c181b15be3b..bf4da1aee26 100644
--- a/x11/gnustep/examples/patches/patch-gui_MyGL_GNUmakefile
+++ b/x11/gnustep/examples/patches/patch-gui_MyGL_GNUmakefile
@@ -1,9 +1,12 @@
-$OpenBSD: patch-gui_MyGL_GNUmakefile,v 1.1.1.1 2007/05/29 03:03:52 ajacoutot Exp $
---- gui/MyGL/GNUmakefile.orig	Mon May 28 19:28:11 2007
-+++ gui/MyGL/GNUmakefile	Mon May 28 19:29:32 2007
-@@ -9,6 +9,7 @@ MyGL_APPLICATION_ICON=MyGL.tiff
+$OpenBSD: patch-gui_MyGL_GNUmakefile,v 1.2 2007/06/04 11:09:13 ajacoutot Exp $
+--- gui/MyGL/GNUmakefile.orig	Thu May 24 06:11:28 2007
++++ gui/MyGL/GNUmakefile	Sun Jun  3 16:12:34 2007
+@@ -7,8 +7,9 @@ MyGL_MAIN_MODEL_FILE=MyGL.gorm
+ MyGL_APPLICATION_ICON=MyGL.tiff
+ 
  MyGL_OBJC_FILES = main.m AppController.m
- MyGL_RESOURCE_FILES = MyGL.gorm MyGL.tiff
+-MyGL_RESOURCE_FILES = MyGL.gorm MyGL.tiff
++MyGL_RESOURCE_FILES = MyGL.gorm MyGL.tiff girl.dae
  
 -ADDITIONAL_TOOL_LIBS += -lGL -lGLU -lm
 +ADDITIONAL_TOOL_LIBS += -L!!X11BASE!!/lib -lGL -lGLU -lm
diff --git a/x11/gnustep/examples/pkg/PLIST b/x11/gnustep/examples/pkg/PLIST
index 92a62455d44..3f80083dcf9 100644
--- a/x11/gnustep/examples/pkg/PLIST
+++ b/x11/gnustep/examples/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2007/05/29 03:03:52 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.2 2007/06/04 11:09:13 ajacoutot Exp $
 lib/GNUstep/ApplicationSupport/
 lib/GNUstep/ApplicationSupport/GSTest/
 lib/GNUstep/ApplicationSupport/GSTest/Composite-test.bundle/
@@ -183,6 +183,7 @@ libexec/GNUstep/MyGL.app/Resources/MyGL.gorm/
 libexec/GNUstep/MyGL.app/Resources/MyGL.gorm/data.classes
 libexec/GNUstep/MyGL.app/Resources/MyGL.gorm/data.info
 libexec/GNUstep/MyGL.app/Resources/MyGL.gorm/objects.gorm
+libexec/GNUstep/MyGL.app/Resources/girl.dae
 libexec/GNUstep/MyGL.app/stamp.make
 libexec/GNUstep/NSBrowserTest.app/
 libexec/GNUstep/NSBrowserTest.app/NSBrowserTest