diff --git a/xine-lib-1.1.20.1-zlib-hg10322.diff b/xine-lib-1.1.20.1-zlib-hg10322.diff
new file mode 100644
index 0000000..a2006c0
--- /dev/null
+++ b/xine-lib-1.1.20.1-zlib-hg10322.diff
@@ -0,0 +1,51 @@
+
+# HG changeset patch
+# User Ulrich Müller <ulm@gentoo.org>
+# Date 1327945720 0
+# Node ID 24d09421ed09d3a78efeab5c9b8ab31daaaba4fd
+# Parent  da296856c52e654cf599248de3a01bb754363c79
+Compile failure in osd.c with sys-libs/zlib-1.2.6
+
+diff -r da296856c52e -r 24d09421ed09 misc/xine-fontconv.c
+--- a/misc/xine-fontconv.c	Wed Jan 18 22:01:28 2012 +0000
++++ b/misc/xine-fontconv.c	Mon Jan 30 17:48:40 2012 +0000
+@@ -109,7 +109,7 @@
+ osd_font_t     font;
+ 
+ 
+-static int gzwrite_i16(gzFile *fp, uint16_t number) {
++static int gzwrite_i16(gzFile fp, uint16_t number) {
+   return gzputc(fp, number & 0xFF) != -1 &&
+          gzputc(fp, (number >> 8) & 0xFF) != -1;
+ }
+@@ -341,7 +341,7 @@
+ 
+   char                filename[1024];
+   FT_Bitmap          *out_bitmap;
+-  gzFile             *fp;
++  gzFile              fp;
+   int                 error;
+   int                 error_counter;
+   int                 glyph_index;
+diff -r da296856c52e -r 24d09421ed09 src/xine-engine/osd.c
+--- a/src/xine-engine/osd.c	Wed Jan 18 22:01:28 2012 +0000
++++ b/src/xine-engine/osd.c	Mon Jan 30 17:48:40 2012 +0000
+@@ -650,7 +650,7 @@
+   osd->display_y = y;
+ }
+ 
+-static uint16_t gzread_i16(gzFile *fp) {
++static uint16_t gzread_i16(gzFile fp) {
+   uint16_t ret;
+   ret = gzgetc(fp);
+   ret |= (gzgetc(fp)<<8);
+@@ -663,7 +663,7 @@
+ 
+ static int osd_renderer_load_font(osd_renderer_t *this, char *filename) {
+ 
+-  gzFile      *fp;
++  gzFile       fp;
+   osd_font_t  *font = NULL;
+   int          i, ret = 0;
+ 
+
diff --git a/xine-lib.changes b/xine-lib.changes
index 386b0fb..b45740f 100644
--- a/xine-lib.changes
+++ b/xine-lib.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue May 15 20:51:22 UTC 2012 - seife+obs@b1-systems.com
+
+- fix build for > 12.1: patch for new zlib; work around autoconf
+  (?) issue with empty directories on x86_64
+
 -------------------------------------------------------------------
 Thu Feb 23 12:51:27 UTC 2012 - coolo@suse.com
 
diff --git a/xine-lib.spec b/xine-lib.spec
index 39efa79..00ac70c 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -144,6 +144,7 @@ Source99:       precheckin_cripple_tarball.sh
 Patch26:        xine-lib-doc-fix-X11R6.diff
 Patch28:        xine-lib-%{version}-ia64-is-not-alpha.diff
 Patch31:        xine-lib-%{version}-glitch-free-pulseaudio.patch
+Patch32:        xine-lib-1.1.20.1-zlib-hg10322.diff
 # *** Addons
 Patch50:        vdr-xine-0.9.3.diff.bz2
 Patch51:        vdr-xine-SUSE.diff
@@ -591,8 +592,8 @@ Summary:        Xine plugins for watching DVDs, DivX and more
 License:        GPL-2.0+ ; SUSE-Public-Domain
 Group:          Productivity/Multimedia/Video/Players
 Requires:       libxine1 = %{version}
-Obsoletes:      xine-mad
 Obsoletes:      xine-internal < %{version}-%{release}
+Obsoletes:      xine-mad
 Provides:       libxine1-dvd = %{version}-%{release}
 Obsoletes:      libxine1-dvd < %{version}-%{release}
 Provides:       libxine1-dxr3 = %{version}-%{release}
@@ -656,6 +657,7 @@ EOF
 %patch26
 %patch28 -p1
 %patch31 -p1
+%patch32 -p1
 %if 0%{suse_version} >= 1110
 # set fuzzy=2 to get patch work with crippled and noncrippled tarball
 %patch50 -p1 -F2
@@ -959,7 +961,13 @@ rm -rf %{buildroot}
 %doc %{_mandir}/man5/xine.*
 %{_defaultdocdir}/xine
 %dir %{_libdir}/xine/plugins/%{abiversion}/post
+%ifarch %{ix86}
 %{_libdir}/xine/plugins/%{abiversion}/vidix
+%else
+%if 0%{?suse_version} <= 1210
+# new automake (?) does no longer install empty dirs...
+%endif
+%endif
 %{_libdir}/xine/plugins/%{abiversion}/mime.types
 #
 # xine fonts