diff --git a/.gitignore b/.gitignore
index 1854a07..5e24b9f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /goocanvas-1.90.2.tar.bz2
 /goocanvas-2.0.1.tar.bz2
+/goocanvas2-8f2c63.tar.xz
diff --git a/goocanvas2-1.90.2-gettext.patch b/goocanvas2-1.90.2-gettext.patch
deleted file mode 100644
index a13c109..0000000
--- a/goocanvas2-1.90.2-gettext.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure.in b/configure.in
-index 1c4adba..4971371 100644
---- a/configure.in
-+++ b/configure.in
-@@ -31,7 +31,7 @@ PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
- AC_SUBST(PACKAGE_CFLAGS)
- AC_SUBST(PACKAGE_LIBS)
- 
--GETTEXT_PACKAGE=goocanvas
-+GETTEXT_PACKAGE=goocanvas2
- AC_SUBST(GETTEXT_PACKAGE)
- AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])
- 
diff --git a/goocanvas2.spec b/goocanvas2.spec
index b7b169c..ad7b224 100644
--- a/goocanvas2.spec
+++ b/goocanvas2.spec
@@ -1,16 +1,18 @@
 %global tarname goocanvas
 %global apiver  2.0
+%global hash    8f2c63
 
 Name:           goocanvas2
 Version:        2.0.1
-Release:        5%{?dist}
+Release:        6.%{hash}git%{?dist}
 Summary:        A new canvas widget for GTK+ that uses cairo for drawing
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://live.gnome.org/GooCanvas
-Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/%{tarname}/1.90/%{tarname}-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# git clone git://git.gnome.org/goocanvas
+# git archive --format=tar --prefix=goocanvas2-8f2c63/ 8f2c63 | xz -c >goocanvas2-8f2c63.tar.xz
+Source0:        %{name}-%{hash}.tar.xz
 
 BuildRequires:  gettext, pkgconfig
 BuildRequires:  autoconf, automake, libtool, gtk-doc
@@ -37,26 +39,23 @@ The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
 %prep
-%setup -q -n %{tarname}-%{version}
+%setup -q -n %{name}-%{hash}
 
 
 %build
+./autogen.sh
 # python GI wrapper is not enabled yet until i figure a proper way to package it
 %configure --disable-static \
-           --with-html-dir=%{_datadir}/gtk-doc/html/%{tarname}-%{apiver} \
+           --enable-gtk-doc=yes \
            --enable-python=no
 make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+make install DESTDIR=%buildroot
+find %buildroot -name '*.la' -exec rm -f {} ';'
 %find_lang %{name}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 
 %post -p /sbin/ldconfig
 
@@ -64,21 +63,22 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files  -f %{name}.lang
-%defattr(-,root,root,-)
 %doc COPYING README ChangeLog AUTHORS NEWS TODO
 %{_libdir}/*.so.*
 %{_libdir}/girepository-1.0/GooCanvas-2.0.typelib
 
 %files devel
-%defattr(-,root,root,-)
-%doc
 %{_includedir}/*
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/%{tarname}-%{apiver}.pc
-%{_datadir}/gtk-doc/html/%{tarname}-%{apiver}
+%{_datadir}/gtk-doc/html/%{name}
 %{_datadir}/gir-1.0/GooCanvas-2.0.gir
 
 %changelog
+* Wed Aug 07 2013 Haïkel Guémar <hguemar@fedoraproject.org> - 2.0.1-6.8f2c63git
+- backport gobject introspection fixes from GNOME git
+- fix FTBFS (RHBZ #992421)
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
@@ -91,7 +91,7 @@ rm -rf $RPM_BUILD_ROOT
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
-* Mon Oct 10 2011 Haïkel Guémar <haikel.guemar@sysfera.com> - 2.0.1-1
+* Mon Oct 10 2011 Haïkel Guémar <hguemar@fedoraproject.org> - 2.0.1-1
 - upstream 2.0.1
 - remove upstreamed patch and enable GIR
 
diff --git a/sources b/sources
index 4618601..50a4a75 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-97b7c82a44ea232ee3b08840c02da1bc  goocanvas-2.0.1.tar.bz2
+b403339f4a3e5d98ab0b2f8103d3ed42  goocanvas2-8f2c63.tar.xz