diff --git a/anjuta-3.0.2.0.tar.bz2 b/anjuta-3.0.2.0.tar.bz2
deleted file mode 100644
index f0acb9f..0000000
--- a/anjuta-3.0.2.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5dce2cf455f9feeea31aea6bce5bae1dbd35793ba8c8009675608dae4d67bac0
-size 10389513
diff --git a/anjuta-3.1.2.tar.bz2 b/anjuta-3.1.2.tar.bz2
new file mode 100644
index 0000000..8e615dc
--- /dev/null
+++ b/anjuta-3.1.2.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:229e715a4083d1d5beaa7786dc10a3c36c3891a16b244821b23a16edb043f353
+size 10468175
diff --git a/anjuta-support-libgda-5.0.patch b/anjuta-support-libgda-5.0.patch
new file mode 100644
index 0000000..9a9677f
--- /dev/null
+++ b/anjuta-support-libgda-5.0.patch
@@ -0,0 +1,37 @@
+diff -ur anjuta-3.0.2.0/configure.ac anjuta-3.0.2.0.patched/configure.ac
+--- anjuta-3.0.2.0/configure.ac	2011-05-23 21:12:40.000000000 +0200
++++ anjuta-3.0.2.0.patched/configure.ac	2011-06-10 21:14:30.486480081 +0200
+@@ -32,7 +32,8 @@
+ GTK_REQUIRED=3.0.0
+ GTHREAD_REQUIRED=2.22.0
+ GDK_PIXBUF_REQUIRED=2.0.0
+-GDA_REQUIRED=4.2.0
++GDA4_REQUIRED=4.2.0
++GDA5_REQUIRED=4.99.0
+ VTE_REQUIRED=0.27.6
+ LIBXML_REQUIRED=2.4.23
+ GDL_REQUIRED=2.91.4
+@@ -157,7 +158,9 @@
+    [gdl-3.0 >= $GDL_REQUIRED])
+ 
+ PKG_CHECK_MODULES([GDA],
+-   [libgda-4.0 >= $GDA_REQUIRED])
++   [libgda-5.0 >= $GDA5_REQUIRED],,
++   [PKG_CHECK_MODULES([GDA],
++      [libgda-4.0 >= $GDA4_REQUIRED])])
+ 	
+ PKG_CHECK_MODULES([VTE],
+    [vte-2.90 >= $VTE_REQUIRED])
+@@ -278,8 +281,10 @@
+ 
+ AM_CONDITIONAL(HAVE_PYTHON, [test x$have_python = xyes])
+ 
+-PKG_CHECK_MODULES(PLUGIN_SYMBOL_DB,
+-		[libgda-4.0 >= $GDA_REQUIRED])
++PKG_CHECK_MODULES([PLUGIN_SYMBOL_DB],
++     [libgda-5.0 >= $GDA5_REQUIRED],,
++     [PKG_CHECK_MODULES([PLUGIN_SYMBOL_DB],
++         [libgda-4.0 >= $GDA4_REQUIRED])])
+ 
+ dnl Setup Anjuta Library flags
+ dnl --------------------------
diff --git a/anjuta.changes b/anjuta.changes
index 9ead8fc..216dcc9 100644
--- a/anjuta.changes
+++ b/anjuta.changes
@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Thu Jun 16 00:31:36 CEST 2011 - dimstar@opensuse.org
+
+- Update to version 3.1.2:
+  + Autocompletion for builder objects in python
+  + Improvements in autotools backend
+  + Bugs fixed: bgo#475261, bgo#651670, bgo#651285, bgo#569994,
+    bgo#644047, bgo#588757, bgo#640470, bgo#642784, bgo#648571,
+    bgo#650930, bgo#652017, bgo#651212.
+- Add bison and flex BuildRequires.
+
+-------------------------------------------------------------------
+Tue Jun  7 12:56:51 UTC 2011 - dimstar@opensuse.org
+
+- Add anjuta-support-libgda-5.0.patch: Support building against
+  libgda 5.0 and libgda 4.0 and add call to gnome-autogen.sh.
+- Replace pkgconfig(libgda-4.0) BuildRequires with
+  pkgconfig(libgda-5.0).
+
 -------------------------------------------------------------------
 Sat Jun  4 09:21:38 UTC 2011 - badshah400@gmail.com
 
diff --git a/anjuta.spec b/anjuta.spec
index 0505a3b4..ea86ecc 100644
--- a/anjuta.spec
+++ b/anjuta.spec
@@ -17,7 +17,7 @@
 
 
 Name:           anjuta
-Version:        3.0.2.0
+Version:        3.1.2
 Release:        1
 License:        GPLv2+
 Summary:        Versatile Integrated Development Environment for GNOME
@@ -25,9 +25,13 @@ Url:            http://anjuta.sourceforge.net/
 Group:          Development/Tools/IDE
 Source:         anjuta-%{version}.tar.bz2
 Source1:        %{name}-rpmlintrc
+# PATCH-FEATURE-UPSTREAM anjuta-support-libgda-5.0.patch bgo#652047 dimstar@opensuse.org -- Also support building with libgda-5.0.
+Patch0:         anjuta-support-libgda-5.0.patch
 BuildRequires:  autogen
 BuildRequires:  binutils-devel
+BuildRequires:  bison
 BuildRequires:  fdupes
+BuildRequires:  flex
 BuildRequires:  gcc-c++
 BuildRequires:  gnome-common
 BuildRequires:  gnome-doc-utils-devel
@@ -53,7 +57,7 @@ BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(gtksourceview-3.0)
 BuildRequires:  pkgconfig(libdevhelp-3.0)
-BuildRequires:  pkgconfig(libgda-4.0)
+BuildRequires:  pkgconfig(libgda-5.0)
 BuildRequires:  pkgconfig(libgraph)
 BuildRequires:  pkgconfig(libgvc)
 BuildRequires:  pkgconfig(libvala-0.12)
@@ -122,9 +126,12 @@ and more.
 %lang_package
 %prep
 %setup -q
+%patch0 -p1
 translation-update-upstream
 
 %build
+# Needed by patch0
+NOCONFIGURE=1 gnome-autogen.sh
 %configure\
         --disable-static \
         --disable-scrollkeeper