diff --git a/x11/gnome/online-accounts/Makefile b/x11/gnome/online-accounts/Makefile
index c67be435129..a8dce1f9373 100644
--- a/x11/gnome/online-accounts/Makefile
+++ b/x11/gnome/online-accounts/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.55 2014/04/15 11:15:51 jasper Exp $
+# $OpenBSD: Makefile,v 1.56 2014/04/18 12:48:51 ajacoutot Exp $
 
 COMMENT=	interfaces for interacting with online accounts
 
@@ -42,10 +42,4 @@ MODGNU_CONFIG_GUESS_DIRS= \
 
 CONFIGURE_ARGS=		--disable-gudev
 
-pre-configure:
-# https://bugzilla.gnome.org/show_bug.cgi?id=726570
-# XXX check if still needed at next release
-	perl -pi -e 's,--libtool=\$$\(top_builddir\)/libtool,--libtool=\$${LIBTOOL},g' \
-		${WRKSRC}/src/goa/Makefile.in
-
 .include <bsd.port.mk>
diff --git a/x11/gnome/online-accounts/patches/patch-src_goa_Makefile_in b/x11/gnome/online-accounts/patches/patch-src_goa_Makefile_in
new file mode 100644
index 00000000000..562da753ddd
--- /dev/null
+++ b/x11/gnome/online-accounts/patches/patch-src_goa_Makefile_in
@@ -0,0 +1,15 @@
+$OpenBSD: patch-src_goa_Makefile_in,v 1.1 2014/04/18 12:48:52 ajacoutot Exp $
+
+https://bugzilla.gnome.org/show_bug.cgi?id=726570
+
+--- src/goa/Makefile.in.orig	Fri Apr 18 14:13:11 2014
++++ src/goa/Makefile.in	Fri Apr 18 14:13:41 2014
+@@ -1006,7 +1006,7 @@ goaenumtypes.c: goaenums.h goaenumtypes.h goaenumtypes
+ @HAVE_INTROSPECTION_TRUE@		--pkg=gobject-2.0 				\
+ @HAVE_INTROSPECTION_TRUE@		--pkg=gio-2.0 					\
+ @HAVE_INTROSPECTION_TRUE@		--pkg-export=goa-1.0				\
+-@HAVE_INTROSPECTION_TRUE@		--libtool=$(top_builddir)/libtool		\
++@HAVE_INTROSPECTION_TRUE@		--libtool="$(LIBTOOL)"				\
+ @HAVE_INTROSPECTION_TRUE@		--c-include='goa/goa.h'				\
+ @HAVE_INTROSPECTION_TRUE@                -I$(top_srcdir)/src	 			\
+ @HAVE_INTROSPECTION_TRUE@                -I$(top_srcdir)/src/goa	 			\