diff --git a/README.SuSE b/README.SuSE
index 9b04e17..0b0a893 100644
--- a/README.SuSE
+++ b/README.SuSE
@@ -9,7 +9,6 @@ To work around this problem, 64 bit version for SuSE Linux uses special
 names for following files:
 
 /usr/bin/pango-querymodules:  /usr/bin/pango-querymodules-64
-/etc/pango/pango.modules:     /etc/pango/pango.modules64
 
 This can cause problems during self-compilation of packages.
 
@@ -26,10 +25,8 @@ Or:
 - Install 32 bit version of Pango.
 - After installation, you must run following commands:
 if [ -x /usr/bin/pango-querymodules ] ; then
-        /usr/bin/pango-querymodules \
-        > /etc/pango/pango.modules
+        /usr/bin/pango-querymodules --update-cache
 fi
 if [ -x /usr/bin/pango-querymodules-64 ] ; then
-        /usr/bin/pango-querymodules-64 \
-        > /etc/pango/pango64.modules
+        /usr/bin/pango-querymodules-64 --update-cache
 fi
diff --git a/baselibs.conf b/baselibs.conf
index 07aa049..4342afc 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1,31 +1,30 @@
 libpango-1_0-0
-  +/etc/pango/pango(64)?.modules
   requires "pango-tools-<targettype>"
   provides "pango-<targettype> = <version>"
   obsoletes "pango-<targettype> < <version>"
   post "%if "%_lib" == "lib64""
-  post "if test -f <prefix>%{_bindir}/pango-querymodules-64; then <prefix>%{_bindir}/pango-querymodules-64 > <prefix>%{_sysconfdir}/pango/pango64.modules; fi"
+  post "if test -f <prefix>%{_bindir}/pango-querymodules-64; then <prefix>%{_bindir}/pango-querymodules-64 --update-cache; fi"
   post "%else"
-  post "if test -f <prefix>%{_bindir}/pango-querymodules; then <prefix>%{_bindir}/pango-querymodules > <prefix>%{_sysconfdir}/pango/pango.modules; fi"
+  post "if test -f <prefix>%{_bindir}/pango-querymodules; then <prefix>%{_bindir}/pango-querymodules --update-cache; fi"
   post "%endif"
 pango-tools
   +/usr/bin/pango-querymodules(-64)?
   post "%if "%_lib" == "lib64""
-  post "if [ $1 == 1 ]; then test -d <prefix>%{_libdir}/pango/1.6.0; if test $? -eq 0; then <prefix>%{_bindir}/pango-querymodules-64 > <prefix>%{_sysconfdir}/pango/pango64.modules; fi; fi"
+  post "if [ $1 == 1 ]; then test -d <prefix>%{_libdir}/pango/1.8.0; if test $? -eq 0; then <prefix>%{_bindir}/pango-querymodules-64 --update-cache; fi; fi"
   post "%else"
-  post "if [ $1 == 1 ]; then test -d <prefix>%{_libdir}/pango/1.6.0; if test $? -eq 0; then <prefix>%{_bindir}/pango-querymodules > <prefix>%{_sysconfdir}/pango/pango.modules; fi; fi"
+  post "if [ $1 == 1 ]; then test -d <prefix>%{_libdir}/pango/1.8.0; if test $? -eq 0; then <prefix>%{_bindir}/pango-querymodules --update-cache; fi; fi"
   post "%endif"
 pango-module-thai-lang
   requires "pango-<targettype>"
   post "%if "%_lib" == "lib64""
-  post "<prefix>%{_bindir}/pango-querymodules-64 > <prefix>%{_sysconfdir}/pango/pango64.modules"
+  post "<prefix>%{_bindir}/pango-querymodules-64 --update-cache"
   post "%else"
-  post "<prefix>%{_bindir}/pango-querymodules > <prefix>%{_sysconfdir}/pango/pango.modules"
+  post "<prefix>%{_bindir}/pango-querymodules --update-cache"
   post "%endif"
   postun "%if "%_lib" == "lib64""
-  postun "<prefix>%{_bindir}/pango-querymodules-64 > <prefix>%{_sysconfdir}/pango/pango64.modules"
+  postun "<prefix>%{_bindir}/pango-querymodules-64 --update-cache"
   postun "%else"
-  postun "<prefix>%{_bindir}/pango-querymodules > <prefix>%{_sysconfdir}/pango/pango.modules"
+  postun "<prefix>%{_bindir}/pango-querymodules --update-cache"
   postun "%endif"
 arch ppc package pango-devel
 arch sparcv9 package pango-devel
diff --git a/macros.pango b/macros.pango
index 614f461..12892e7 100644
--- a/macros.pango
+++ b/macros.pango
@@ -18,9 +18,9 @@ Requires(postun): pango-tools
 # On install, update the cache
 %pango_module_post                                                            \
 %if "%_lib" == "lib64"                                                        \
-  %{_bindir}/pango-querymodules-64 > %{_sysconfdir}/pango/pango64.modules     \
+  %{_bindir}/pango-querymodules-64 --update-cache                             \
 %else                                                                         \
-  %{_bindir}/pango-querymodules > %{_sysconfdir}/pango/pango.modules          \
+  %{_bindir}/pango-querymodules --update-cache                                \
 %endif
 
 # On uninstall, update the cache. Note: we ignore upgrades (already
@@ -28,8 +28,8 @@ Requires(postun): pango-tools
 %pango_module_postun                                                          \
 if [ $1 -eq 0 ]; then                                                         \
   %if "%_lib" == "lib64"                                                      \
-    %{_bindir}/pango-querymodules-64 > %{_sysconfdir}/pango/pango64.modules   \
+    %{_bindir}/pango-querymodules-64 --update-cache                           \
   %else                                                                       \
-    %{_bindir}/pango-querymodules > %{_sysconfdir}/pango/pango.modules        \
+    %{_bindir}/pango-querymodules --update-cache                              \
   %endif                                                                      \
 fi
diff --git a/pango-1.30.1.tar.xz b/pango-1.30.1.tar.xz
deleted file mode 100644
index 695cead..0000000
--- a/pango-1.30.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3a8c061e143c272ddcd5467b3567e970cfbb64d1d1600a8f8e62435556220cbe
-size 1162828
diff --git a/pango-1.32.1.tar.xz b/pango-1.32.1.tar.xz
new file mode 100644
index 0000000..8210268
--- /dev/null
+++ b/pango-1.32.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:484babf7e1ac4bf959a0babe8168f180acb516932d70e2985de5f6e2961fcd82
+size 1035924
diff --git a/pango-implicit.patch b/pango-implicit.patch
deleted file mode 100644
index 7cb3bad..0000000
--- a/pango-implicit.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: pango-1.30.1/pango/pango-utils.h
-===================================================================
---- pango-1.30.1.orig/pango/pango-utils.h
-+++ pango-1.30.1/pango/pango-utils.h
-@@ -48,6 +48,8 @@ void     pango_lookup_aliases (const cha
- 			       int          *n_families);
- #endif /* PANGO_ENABLE_BACKEND */
- 
-+char *   pango_config_key_get_system (const char *key);
-+
- gboolean pango_parse_enum     (GType       type,
- 			       const char *str,
- 			       int        *value,
diff --git a/pango.changes b/pango.changes
index 619749e..f4c506e 100644
--- a/pango.changes
+++ b/pango.changes
@@ -1,3 +1,69 @@
+-------------------------------------------------------------------
+Fri Sep 28 07:22:19 UTC 2012 - vuntz@opensuse.org
+
+- Update to version 1.32.1:
+  + Fixup grapheme clusters, cause of crashes (bgo#684959)
+
+-------------------------------------------------------------------
+Wed Sep 26 21:37:07 UTC 2012 - zaitor@opensuse.org
+
+- Update to version 1.32.0:
+  + Add a --without-xfg configure option.
+  + Add pango_shape_full().
+
+-------------------------------------------------------------------
+Sat Sep 22 13:59:48 UTC 2012 - dimstar@opensuse.org
+
+- Update to version 1.31.2:
+  + More work done towards thread-safety.
+  + Build fixes on OS.
+- Add pkgconfig(glib-2.0) BuildRequires so it can be versioned.
+
+-------------------------------------------------------------------
+Mon Sep 10 11:10:04 UTC 2012 - vuntz@opensuse.org
+
+- Drop pango64.patch:
+  + pango-querymodules now has a --update-cache option that will
+    update a pango.modules file under %{_libdir}. This means we no
+    longer need to differentiate the 64bit file since it's by
+    definition in a different directory.
+  + Use this --update-cache option instead of redirecting the
+    output of pango-querymodules in the scriplets, in the macros we
+    define in macros.pango, and in baselibs.conf.
+  + Touch %{_libdir}/pango/%{pango_binary_version}/pango.modules in
+    %install instead of %{_sysconfdir}/pango/pango.modules: this is
+    the new file listing the modules.
+  + Update README.SuSE accordingly.
+  + As a side-effect, this fixes bnc#346210.
+
+-------------------------------------------------------------------
+Sun Sep  9 19:54:00 UTC 2012 - zaitor@opensuse.org
+
+- Update to version 1.31.1:
+  + The module cache file can now be located in libdir.
+  + Initial work towards making pango thread-safe.
+  + Update to Unicode 6.1.
+  + Deprecate a few API.
+  + Bugs fixed: bgo#682421, bgo#678721, bgo#678997, bgo#653347,
+    bgo#682952.
+- Rebased pango64.patch.
+
+-------------------------------------------------------------------
+Tue Aug 21 15:28:34 UTC 2012 - dimstar@opensuse.org
+
+- Update to version 1.31.0:
+  + Port to harfbuzz 0.9.x, use external harfbuzz
+  + Remove Arabic, Hangul, Hebrew, Khmer, Syriac, Tibetan and Thai
+    shapers (replaced by harfbuzz)
+  + Remove Indic module (replaced by harfbuzz)
+  + Remove Atsui support (superseded by CoreText)
+  + Remove PangoX
+  + Bugs fixed: bgo#679654, bgo#680965, bgo#681423.
+- Drop pango-implicit.patch: fixed upstream.
+- Add pkgconfig(harfbuzz) BuildRequires: new dependency.
+- Bump pango_binary_version defines to 1.8.0 (in baselibs.conf
+  too).
+
 -------------------------------------------------------------------
 Wed Jun  6 19:30:03 UTC 2012 - dimstar@opensuse.org
 
diff --git a/pango.spec b/pango.spec
index 382a18c..68556a9 100644
--- a/pango.spec
+++ b/pango.spec
@@ -17,33 +17,31 @@
 
 
 # When updating the binary version, do not forget to also update baselibs.conf
-%define pango_binary_version 1.6.0
+%define pango_binary_version 1.8.0
 
 Name:           pango
-Version:        1.30.1
+Version:        1.32.1
 Release:        0
 Summary:        Library for Layout and Rendering of Text
 License:        LGPL-2.1+
 Group:          System/Libraries
 Url:            http://www.pango.org/
-Source:         http://download.gnome.org/sources/pango/1.30/%{name}-%{version}.tar.xz
+Source:         http://download.gnome.org/sources/pango/1.32/%{name}-%{version}.tar.xz
 Source1:        README.SuSE
 Source2:        macros.pango
 Source99:       baselibs.conf
-# PATCH-FIX-UPSTREAM pango64.patch bgo129534 -- needed for biarch. Unfortunately, this is not good enough for usptream.
-Patch0:         pango64.patch
-# PATCH-FIX-UPSTREAM pango-implicit.patch bgo#677627 dimstar@opensuse.org -- Add missing function prototype
-Patch1:         pango-implicit.patch
 BuildRequires:  gcc-c++
 BuildRequires:  gtk-doc
 BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(cairo)
 BuildRequires:  pkgconfig(fontconfig)
 BuildRequires:  pkgconfig(freetype2)
+BuildRequires:  pkgconfig(glib-2.0) >= 2.33.12
 BuildRequires:  pkgconfig(gobject-2.0)
 BuildRequires:  pkgconfig(gobject-introspection-1.0)
+BuildRequires:  pkgconfig(harfbuzz) >= 0.9.3
 BuildRequires:  pkgconfig(libthai) >= 0.1.9
-BuildRequires:  pkgconfig(xft)
+BuildRequires:  pkgconfig(xft) >= 2.0.0
 BuildRequires:  pkgconfig(xrender)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -112,10 +110,10 @@ is needed.
 Pango forms the core of text and font handling for GTK+.
 
 %package devel
-Requires:       libpango-1_0-0 = %{version}
-Requires:       typelib-1_0-Pango-1_0 = %{version}
 Summary:        Library for Layout and Rendering of Text -- Development Files
 Group:          Development/Libraries/GNOME
+Requires:       libpango-1_0-0 = %{version}
+Requires:       typelib-1_0-Pango-1_0 = %{version}
 # bug437293
 %ifarch ppc64
 Obsoletes:      pango-devel-64bit
@@ -135,27 +133,25 @@ to develop applications that require these.
 
 %prep
 %setup -q
-%if "%_lib" == "lib64"
-cp -a %{S:1} .
-%patch0 -p0
+%if "%{_lib}" == "lib64"
+cp -a %{SOURCE1} .
 %endif
-%patch1 -p1
 
 %build
 %configure --disable-static --with-pic
-make %{?jobs:-j%jobs}
+make %{?_smp_mflags}
 
 %install
-%makeinstall
+%make_install
 find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
-touch %{buildroot}%{_sysconfdir}/pango/pango.modules
-%if "%_lib" == "lib64"
+mkdir -p %{buildroot}%{_sysconfdir}/pango/
+touch %{buildroot}%{_libdir}/pango/%{pango_binary_version}/pango.modules
+%if "%{_lib}" == "lib64"
 mv %{buildroot}%{_bindir}/pango-querymodules %{buildroot}%{_bindir}/pango-querymodules-64
-mv %{buildroot}%{_sysconfdir}/pango/pango.modules %{buildroot}%{_sysconfdir}/pango/pango64.modules
 %endif
 # Install rpm macros
 mkdir -p %{buildroot}%{_sysconfdir}/rpm
-cp %{S:2} %{buildroot}%{_sysconfdir}/rpm
+cp %{SOURCE2} %{buildroot}%{_sysconfdir}/rpm
 
 %clean
 rm -rf %{buildroot}
@@ -164,21 +160,20 @@ rm -rf %{buildroot}
 # Note: when updating scriptlets, don't forget to also update baselibs.conf
 ###########################################################################
 
-# Convenient %define for the scriplets
-%if "%_lib" == "lib64"
+# Convenient %%define for the scriplets
+%if "%{_lib}" == "lib64"
 %define _pango_querymodules %{_bindir}/pango-querymodules-64
-%define _pango_querymodules_update_cache %{_pango_querymodules} > %{_sysconfdir}/pango/pango64.modules
 %else
 %define _pango_querymodules %{_bindir}/pango-querymodules
-%define _pango_querymodules_update_cache %{_pango_querymodules} > %{_sysconfdir}/pango/pango.modules
 %endif
+%define _pango_querymodules_update_cache %{_pango_querymodules} --update-cache
 
 %post -n libpango-1_0-0
 /sbin/ldconfig
 %if 0
 # In case libpango-1_0-0 gets installed before pango-tools, we don't want to
 # fail. So we make the call to pango-querymodules dependent on the existence of
-# the binary. This is why we also have a %post for pango-tools.
+# the binary. This is why we also have a %%post for pango-tools.
 %endif
 if test -f %{_pango_querymodules}; then
   %{_pango_querymodules_update_cache}
@@ -202,7 +197,7 @@ fi
 %if 0
 # If we install pango-tools for the first time, then we should run it in case
 # libpango-1_0-0 was installed first (ie, if
-# %{_libdir}/pango/%{pango_binary_version} already exists) which means
+# %%{_libdir}/pango/%%{pango_binary_version} already exists) which means
 # pango-querymodules couldn't run there.
 %endif
 if [ $1 == 1 ]; then
@@ -214,34 +209,20 @@ fi
 
 %files -n libpango-1_0-0
 %defattr(-,root,root)
-%if "%_lib" == "lib64"
+%if "%{_lib}" == "lib64"
 %doc README AUTHORS COPYING ChangeLog README.SuSE
 %else
 %doc README AUTHORS COPYING ChangeLog
 %endif
 %dir %{_libdir}/pango
 %dir %{_libdir}/pango/%{pango_binary_version}
+%ghost %{_libdir}/pango/%{pango_binary_version}/pango.modules
 %dir %{_libdir}/pango/%{pango_binary_version}/modules
-%{_libdir}/pango/%{pango_binary_version}/modules/pango-arabic-fc.so
 %{_libdir}/pango/%{pango_binary_version}/modules/pango-arabic-lang.so
 %{_libdir}/pango/%{pango_binary_version}/modules/pango-basic-fc.so
-%{_libdir}/pango/%{pango_binary_version}/modules/pango-basic-x.so
-%{_libdir}/pango/%{pango_binary_version}/modules/pango-hangul-fc.so
-%{_libdir}/pango/%{pango_binary_version}/modules/pango-hebrew-fc.so
-%{_libdir}/pango/%{pango_binary_version}/modules/pango-indic-fc.so
 %{_libdir}/pango/%{pango_binary_version}/modules/pango-indic-lang.so
-%{_libdir}/pango/%{pango_binary_version}/modules/pango-khmer-fc.so
-%{_libdir}/pango/%{pango_binary_version}/modules/pango-syriac-fc.so
-%{_libdir}/pango/%{pango_binary_version}/modules/pango-thai-fc.so
-%{_libdir}/pango/%{pango_binary_version}/modules/pango-tibetan-fc.so
 %{_libdir}/lib*.so.*
 %dir %{_sysconfdir}/pango
-%{_sysconfdir}/pango/pangox.aliases
-%if "%_lib" == "lib64"
-%ghost %{_sysconfdir}/pango/pango64.modules
-%else
-%ghost %{_sysconfdir}/pango/pango.modules
-%endif
 
 %files -n typelib-1_0-Pango-1_0
 %defattr(-,root,root)
diff --git a/pango64.patch b/pango64.patch
deleted file mode 100644
index 2b63a19..0000000
--- a/pango64.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Index: modules/Makefile.am
-===================================================================
---- modules/Makefile.am.orig
-+++ modules/Makefile.am
-@@ -30,10 +30,10 @@ install-data-local: $(top_builddir)/pang
- 	@if $(RUN_QUERY_MODULES_TEST) && test -z "$(DESTDIR)" ; then 	\
- 	  echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango \&\& 	\
- 	  $(top_builddir)/pango/pango-querymodules$(EXEEXT) 		\
--		\> $(DESTDIR)$(sysconfdir)/pango/pango.modules ;	\
-+		\> $(DESTDIR)$(sysconfdir)/pango/pango64.modules ;	\
- 	  $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango && 		\
- 	  $(top_builddir)/pango/pango-querymodules$(EXEEXT) 		\
--		> $(DESTDIR)$(sysconfdir)/pango/pango.modules ;		\
-+		> $(DESTDIR)$(sysconfdir)/pango/pango64.modules ;	\
- 	else								\
- 	  echo "***" ; 							\
- 	  echo "*** Warning: $(sysconfdir)/pango/pango.modules" ; 	\
-Index: modules/pangorc
-===================================================================
---- modules/pangorc.orig
-+++ modules/pangorc
-@@ -5,4 +5,4 @@
- #
- 
- [Pango]
--ModuleFiles = ../modules/pango.modules
-+ModuleFiles = ../modules/pango64.modules
-Index: pango/modules.c
-===================================================================
---- pango/modules.c.orig
-+++ pango/modules.c
-@@ -328,7 +328,7 @@ find_or_create_module (const char *raw_p
-       /* This is an entry put there by make install on the
-        * packager's system. On Windows a prebuilt Pango
-        * package can be installed in a random
--       * location. The pango.modules file distributed in
-+       * location. The pango64.modules file distributed in
-        * such a package contains paths from the package
-        * builder's machine. Replace the path with the real
-        * one on this machine. */
-@@ -509,7 +509,7 @@ read_modules (void)
- 
-   if (!file_str)
-     file_str = g_build_filename (pango_get_sysconf_subdirectory (),
--				 "pango.modules",
-+				 "pango64.modules",
- 				 NULL);
- 
-   files = pango_split_file_list (file_str);
-@@ -620,7 +620,7 @@ build_map (PangoMapInfo *info)
-       if (!no_module_warning)
- 	{
- 	  gchar *filename = g_build_filename (pango_get_sysconf_subdirectory (),
--					      "pango.modules",
-+					      "pango64.modules",
- 					      NULL);
- 	  g_critical ("No modules found:\n"
- 		      "No builtin or dynamically loaded modules were found.\n"
-Index: modules/Makefile.in
-===================================================================
---- modules/Makefile.in.orig
-+++ modules/Makefile.in
-@@ -572,10 +572,10 @@ install-data-local: $(top_builddir)/pang
- 	@if $(RUN_QUERY_MODULES_TEST) && test -z "$(DESTDIR)" ; then 	\
- 	  echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango \&\& 	\
- 	  $(top_builddir)/pango/pango-querymodules$(EXEEXT) 		\
--		\> $(DESTDIR)$(sysconfdir)/pango/pango.modules ;	\
-+		\> $(DESTDIR)$(sysconfdir)/pango/pango64.modules ;	\
- 	  $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango && 		\
- 	  $(top_builddir)/pango/pango-querymodules$(EXEEXT) 		\
--		> $(DESTDIR)$(sysconfdir)/pango/pango.modules ;		\
-+		> $(DESTDIR)$(sysconfdir)/pango/pango64.modules ;	\
- 	else								\
- 	  echo "***" ; 							\
- 	  echo "*** Warning: $(sysconfdir)/pango/pango.modules" ; 	\