diff --git a/harfbuzz-0.9.6.tar.bz2 b/harfbuzz-0.9.6.tar.bz2
deleted file mode 100644
index 8c999b5..0000000
--- a/harfbuzz-0.9.6.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:394a849d6061993018754b0cc04110891ad215e3df3f6953b75dcc55a11f9d9b
-size 861115
diff --git a/harfbuzz-0.9.7.tar.bz2 b/harfbuzz-0.9.7.tar.bz2
new file mode 100644
index 0000000..2176c00
--- /dev/null
+++ b/harfbuzz-0.9.7.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bd2999859f8828461fedae23e4af52d926ac32a73245f03ae2d2065205e9cf25
+size 876051
diff --git a/harfbuzz-missing-return.patch b/harfbuzz-missing-return.patch
new file mode 100644
index 0000000..c4c71c7
--- /dev/null
+++ b/harfbuzz-missing-return.patch
@@ -0,0 +1,18 @@
+From 7c5b7fe686c9163afe2f31fbeac6f8c8512f5516 Mon Sep 17 00:00:00 2001
+From: Behdad Esfahbod <behdad@behdad.org>
+Date: Thu, 22 Nov 2012 19:15:08 +0000
+Subject: Fix hb_shape_plan_get_shaper()
+
+---
+diff --git a/src/hb-shape-plan.cc b/src/hb-shape-plan.cc
+index 7735d4e..22a226f 100644
+--- a/src/hb-shape-plan.cc
++++ b/src/hb-shape-plan.cc
+@@ -304,4 +304,5 @@ retry:
+ const char *
+ hb_shape_plan_get_shaper (hb_shape_plan_t *shape_plan)
+ {
++  return shape_plan->shaper_name;
+ }
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/harfbuzz.changes b/harfbuzz.changes
index 2f953cf..f412aa6 100644
--- a/harfbuzz.changes
+++ b/harfbuzz.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Tue Dec  4 14:11:18 UTC 2012 - vuntz@opensuse.org
+
+- Update to version 0.9.7:
+  + Some API additions and changes (see NEWS for details).
+  + Fix Arabic contextual joining using pre-context text.
+  + Fix Sinhala "split matra" mess.
+  + Fix Khmer shaping with broken fonts.
+  + Implement Thai "PUA" shaping for old fonts.
+  + Do NOT route Kharoshthi script through the Indic shaper.
+  + Disable fallback positioning for Indic and Thai shapers.
+  + Misc fixes.
+  + hb-shape / hb-view changes:
+    - Add --text-before and --text-after
+    - Add --bot / --eot / --preserve-default-ignorables
+    - hb-shape --output-format=json
+- Add harfbuzz-missing-return.patch: fix missing return value.
+
 -------------------------------------------------------------------
 Wed Nov 14 14:11:21 UTC 2012 - dimstar@opensuse.org
 
diff --git a/harfbuzz.spec b/harfbuzz.spec
index b99e6cb..fdfa08b 100644
--- a/harfbuzz.spec
+++ b/harfbuzz.spec
@@ -17,7 +17,7 @@
 
 
 Name:           harfbuzz
-Version:        0.9.6
+Version:        0.9.7
 Release:        0
 # FIXME: graphite2 is not packaged / http://projects.palaso.org/projects/graphitedev
 Summary:        An OpenType text shaping engine
@@ -26,6 +26,8 @@ Group:          Productivity/Text/Utilities
 Url:            http://www.freedesktop.org/wiki/Software/HarfBuzz
 Source:         http://www.freedesktop.org/software/harfbuzz/release/%{name}-%{version}.tar.bz2
 Source99:       baselibs.conf
+# PATCH-FIX-UPSTREAM harfbuzz-missing-return.patch vuntz@opensuse.org -- Fix missing return value, taken from git
+Patch0:         harfbuzz-missing-return.patch
 BuildRequires:  gcc-c++
 BuildRequires:  pkgconfig(cairo) >= 1.8.0
 BuildRequires:  pkgconfig(cairo-ft)
@@ -65,6 +67,7 @@ HarfBuzz is an OpenType text shaping engine.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure \