diff --git a/devel/guile-gnome/distinfo b/devel/guile-gnome/distinfo
index 788094e9909c..33650abe11ce 100644
--- a/devel/guile-gnome/distinfo
+++ b/devel/guile-gnome/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2011/05/13 02:50:06 dmcmahill Exp $
+$NetBSD: distinfo,v 1.6 2012/05/04 13:15:17 hans Exp $
 
 SHA1 (guile-gnome-platform-2.16.1.tar.gz) = 3cf7cc8de6f261e6cf48d34e691706fe4b7f1061
 RMD160 (guile-gnome-platform-2.16.1.tar.gz) = 4723f091e015c4fca6986c48fa143e7fd3070631
@@ -6,3 +6,5 @@ Size (guile-gnome-platform-2.16.1.tar.gz) = 3494333 bytes
 SHA1 (patch-aa) = 6343a2d81e9f2747250f231beee376c21ba3bfb5
 SHA1 (patch-ab) = bcfc2cf7eccbef8c17db683a7fbbdef7b05c9d42
 SHA1 (patch-ac) = 7409fd75f94ec0a59b94939853b41b85e1a69768
+SHA1 (patch-corba_gnome_corba_Makefile.in) = 52e00564e2d246e78e82787809706aa7c7e44523
+SHA1 (patch-glib_gnome_gobject_Makefile.in) = 83a5533d70e36bb55476661af066e0ceaf13c1f0
diff --git a/devel/guile-gnome/patches/patch-corba_gnome_corba_Makefile.in b/devel/guile-gnome/patches/patch-corba_gnome_corba_Makefile.in
new file mode 100644
index 000000000000..faef9371dcc8
--- /dev/null
+++ b/devel/guile-gnome/patches/patch-corba_gnome_corba_Makefile.in
@@ -0,0 +1,13 @@
+$NetBSD: patch-corba_gnome_corba_Makefile.in,v 1.1 2012/05/04 13:15:18 hans Exp $
+
+--- corba/gnome/corba/Makefile.in.orig	2008-07-03 17:18:02.000000000 +0200
++++ corba/gnome/corba/Makefile.in	2012-05-03 17:10:49.783244723 +0200
+@@ -693,7 +693,7 @@ export GUILE_LOAD_PATH
+ 	|| { rm $@; false; }
+ .c.doc:
+ 	$(CPP) -DSCM_MAGIC_SNARF_DOCS $(GUILE_SNARF_CFLAGS) $< \
+-	  | grep -E '^\^\^ {.*\^\^ }' > $@ || { rm $@; false; }
++	  | grep -E '(\^\^ {|\^\^ })' > $@ || { rm $@; false; }
+ 
+ %.scm guile-gnome-gw-%.c: %-spec.scm
+ 	guile $(GUILE_FLAGS) -c \
diff --git a/devel/guile-gnome/patches/patch-glib_gnome_gobject_Makefile.in b/devel/guile-gnome/patches/patch-glib_gnome_gobject_Makefile.in
new file mode 100644
index 000000000000..ef0284ced213
--- /dev/null
+++ b/devel/guile-gnome/patches/patch-glib_gnome_gobject_Makefile.in
@@ -0,0 +1,13 @@
+$NetBSD: patch-glib_gnome_gobject_Makefile.in,v 1.1 2012/05/04 13:15:18 hans Exp $
+
+--- glib/gnome/gobject/Makefile.in.orig	2008-07-03 17:18:05.000000000 +0200
++++ glib/gnome/gobject/Makefile.in	2012-05-03 16:48:27.192315854 +0200
+@@ -770,7 +770,7 @@ export GUILE_LOAD_PATH
+ 	|| { rm $@; false; }
+ .c.doc:
+ 	$(CPP) -DSCM_MAGIC_SNARF_DOCS $(GUILE_SNARF_CFLAGS) $< \
+-	  | grep -E '^\^\^ {.*\^\^ }' > $@ || { rm $@; false; }
++	  | grep -E '(\^\^ {|\^\^ })' > $@ || { rm $@; false; }
+ 
+ %.scm guile-gnome-gw-%.c: %-spec.scm
+ 	guile $(GUILE_FLAGS) -c \