diff --git a/baselibs.conf b/baselibs.conf
index d65d06d..2a19d30 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1,8 +1,8 @@
-libcamel-1_2-29
-libebackend-1_2-1
+libcamel-1_2-30
+libebackend-1_2-2
 libebook-1_2-12
-libecal-1_2-10
-libedata-book-1_2-11
-libedata-cal-1_2-13
-libedataserver-1_2-15
+libecal-1_2-11
+libedata-book-1_2-12
+libedata-cal-1_2-14
+libedataserver-1_2-16
 libedataserverui-3_0-1
diff --git a/evolution-data-server-3.2.1.tar.bz2 b/evolution-data-server-3.2.1.tar.bz2
deleted file mode 100644
index 7e41c9f..0000000
--- a/evolution-data-server-3.2.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:55373b31d2b32cbf209b736350e2fee417f4a71c1d4200263b8f688dd84da056
-size 4606173
diff --git a/evolution-data-server-3.3.2.tar.bz2 b/evolution-data-server-3.3.2.tar.bz2
new file mode 100644
index 0000000..c3414c2
--- /dev/null
+++ b/evolution-data-server-3.3.2.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b99daf43c15e060505ff5dbe31bf4c41c28e553b1febd836d58fa96e2007c027
+size 4618893
diff --git a/evolution-data-server.changes b/evolution-data-server.changes
index ef5d823..1f11bfb 100644
--- a/evolution-data-server.changes
+++ b/evolution-data-server.changes
@@ -1,3 +1,51 @@
+-------------------------------------------------------------------
+Mon Nov 21 08:05:04 UTC 2011 - dimstar@opensuse.org
+
+- Update to version 3.3.2:
+  + Move remaining CamelURL elements to CamelSettings.
+  + IMAP: Split off a new mutex for commands and responses.
+  + Remove g_thread_init() calls.
+  + Avoid possible crash when url->path is NULL
+  + Make local addressbook backend store image data as URIs.
+  + CamelTcpStreamRaw: Use PR_Interrupt() to cancel blocked I/O.
+  + Use the same technique in imapx_parser_thread().
+  + Kill gtk-doc tmpl files.
+  + Camel no longer depends on libedataserver.
+  + Add useful GBinding transform funcs from e-util.
+  + Bugs fixed: bgo#440316, bgo#652171, bgo#652175, bgo#655167,
+    bgo#659736, bgo#660182, bgo#660646, bgo#660972, bgo#660974,
+    bgo#661033, bgo#662473, bgo#662524, bgo#662643, bgo#662929,
+    bgo#663062, bgo#663219
+  + Updated translations.
+
+-------------------------------------------------------------------
+Thu Oct 27 18:18:27 UTC 2011 - dimstar@opensuse.org
+
+- Update to version 3.3.1.1:
+  + Work around libgthread shenanigans in GLib 2.31.
+- Drop evolution-data-server-g_thread.patch: fixed upstream.
+- Update the soname defines following the upstream changes.
+- Change evo_version to 3.4, as this is the development tree
+  leading to evolution-data-server 3.4.
+- Add a with_introspection defines to easily enable/disable
+  building of gobject-introspection and vala bindings. Currently,
+  this is disabled due to bgo#662888. Based on with_introspection,
+  pass either --disable-introspection --disable-vala-bindings (if
+  with_introspection=0) or --enable-vala-bindings
+  (with_introspection=1) to configure.
+
+-------------------------------------------------------------------
+Wed Oct 26 19:46:39 UTC 2011 - dimstar@opensuse.org
+
+- Update to version 3.3.1:
+  + Avoid a crash in camel_session_get_service_by_url()
+  + Empty contacts list when pressing To: in composer [bgo#660870]
+  + Bugs fixed: bgo#660656, bgo#527614, bgo#661549, bgo#656603,
+    bgo#661448.
+  + Updated translations.
+- Add evolution-data-server-g_thread.patch: Do not call
+  g_thread_init. Taken from upstream git.
+
 -------------------------------------------------------------------
 Sun Oct 16 17:41:31 UTC 2011 - vuntz@opensuse.org
 
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index d7e13fe..3fb31d7 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -17,27 +17,29 @@
 
 
 %define USE_EVOLDAP 0
+%define with_introspection 0
 
 # Shared Library soNUMs, to make it easier for updates
 # When updating the sonums, do not forget to also update baselibs.conf
-%define so_camel 29
-%define so_ebackend 1
-%define so_ebook 12
-%define so_ecal 10
-%define so_edata_book 11
-%define so_edata_cal 13
-%define so_edataserver 15
+%define so_camel 31
+%define so_ebackend 2
+%define so_ebook 13
+%define so_ecal 11
+%define so_edata_book 13
+%define so_edata_cal 14
+%define so_edataserver 16
 %define so_edataserverui 1
 
 Name:           evolution-data-server
-%define _evo_version 3.2
+%define _evo_version 3.4
 License:        LGPLv2+
 Group:          Development/Libraries/GNOME
-Version:        3.2.1
+Version:        3.3.2
 Release:        1
+# FIXME: Verify if introspection can be enabled again. See bgo#662888
 Summary:        Evolution Data Server
 Url:            http://www.gnome.org
-Source0:        http://download.gnome.org/sources/evolution-data-server/3.2/%{name}-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/evolution-data-server/3.3/%{name}-%{version}.tar.bz2
 Source99:       baselibs.conf
 BuildRequires:  bison
 BuildRequires:  db-devel
@@ -223,8 +225,13 @@ translation-update-upstream
     --enable-ipv6=yes \
     --enable-smime=yes \
     --enable-nntp=yes \
-    --enable-vala-bindings \
-    --disable-static
+    --disable-static \
+%if %{?with_introspection}
+    --enable-vala-bindings
+%else
+    --disable-vala-bindings \
+    --disable-introspection
+%endif
 make %{?_smp_mflags} V=1
 
 %install
@@ -292,7 +299,6 @@ find %{buildroot} -name '*.la' -type f -delete -print
 %files -n libcamel-1_2-%{so_camel}
 %defattr(-, root, root)
 %{_libdir}/libcamel-1.2.so.%{so_camel}*
-%{_libdir}/libcamel-provider-1.2.so.%{so_camel}*
 
 %files -n libebackend-1_2-%{so_ebackend}
 %defattr(-, root, root)
@@ -305,12 +311,16 @@ find %{buildroot} -name '*.la' -type f -delete -print
 %files -n libecal-1_2-%{so_ecal}
 %defattr(-, root, root)
 %{_libdir}/libecal-1.2.so.%{so_ecal}*
+%if %{?with_introspection}
 %{_libdir}/girepository-1.0/ECalendar-1.2.typelib
+%endif
 
 %files -n libedata-book-1_2-%{so_edata_book}
 %defattr(-, root, root)
 %{_libdir}/libedata-book-1.2.so.%{so_edata_book}*
+%if %{?with_introspection}
 %{_libdir}/girepository-1.0/EBook-1.2.typelib
+%endif
 
 %files -n libedata-cal-1_2-%{so_edata_cal}
 %defattr(-, root, root)
@@ -319,7 +329,9 @@ find %{buildroot} -name '*.la' -type f -delete -print
 %files -n libedataserver-1_2-%{so_edataserver}
 %defattr(-, root, root)
 %{_libdir}/libedataserver-1.2.so.%{so_edataserver}*
+%if %{?with_introspection}
 %{_libdir}/girepository-1.0/EDataServer-1.2.typelib
+%endif
 
 %files -n libedataserverui-3_0-%{so_edataserverui}
 %defattr(-, root, root)
@@ -330,11 +342,13 @@ find %{buildroot} -name '*.la' -type f -delete -print
 %{_includedir}/evolution-data-server-%{_evo_version}/
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
+%if %{?with_introspection}
 %{_datadir}/gir-1.0/*.gir
 %dir %{_datadir}/vala
 %dir %{_datadir}/vala/vapi
 %{_datadir}/vala/vapi/*.deps
 %{_datadir}/vala/vapi/*.vapi
+%endif
 
 %files doc
 %defattr(-, root, root)