diff --git a/mingw32-pixman.spec b/mingw32-pixman.spec
index 0e08c7c..d3da3d9 100644
--- a/mingw32-pixman.spec
+++ b/mingw32-pixman.spec
@@ -3,6 +3,7 @@
 %global _use_internal_dependency_generator 0
 %global __find_requires %{_mingw32_findrequires}
 %global __find_provides %{_mingw32_findprovides}
+%define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-pixman
 Version:        0.15.20
@@ -16,10 +17,12 @@ Group:          Development/Libraries
 Source0:        http://xorg.freedesktop.org/archive/individual/lib/pixman-%{version}.tar.bz2
 Source1:        make-pixman-snapshot.sh
 
+Patch0:         pixman-disable-blitters-test-testcase.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  mingw32-filesystem >= 49
+BuildRequires:  mingw32-filesystem >= 52
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
 BuildRequires:  mingw32-dlfcn
@@ -39,8 +42,12 @@ Group:          Development/Libraries
 Static version of the MinGW Windows Pixman library.
 
 
+%{_mingw32_debug_package}
+
+
 %prep
 %setup -q -n pixman-%{version}
+%patch0 -p0
 
 
 %build
@@ -79,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Aug 13 2009 Erik van Pienbroek <epienbro@fedoraproject.org> - 0.15.20-1
 - Update to version 0.15.20
 - Updated SOURCE0 and URL
+- Automatically generate debuginfo subpackage
+- Don't build the 'blitters-test' testcase as it requires the memalign function
+  which we don't have on MinGW
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.15.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
diff --git a/pixman-disable-blitters-test-testcase.patch b/pixman-disable-blitters-test-testcase.patch
new file mode 100644
index 0000000..d376539
--- /dev/null
+++ b/pixman-disable-blitters-test-testcase.patch
@@ -0,0 +1,20 @@
+--- test/Makefile.in.orig	2009-08-13 00:44:30.275385290 +0200
++++ test/Makefile.in	2009-08-13 00:47:49.722395581 +0200
+@@ -58,7 +58,7 @@
+ @HAVE_GTK_TRUE@	alpha-test$(EXEEXT) screen-test$(EXEEXT) \
+ @HAVE_GTK_TRUE@	convolution-test$(EXEEXT) trap-test$(EXEEXT)
+ am__EXEEXT_2 = region-test$(EXEEXT) scaling-test$(EXEEXT) \
+-	blitters-test$(EXEEXT) fetch-test$(EXEEXT) oob-test$(EXEEXT) \
++	fetch-test$(EXEEXT) oob-test$(EXEEXT) \
+ 	window-test$(EXEEXT) trap-crasher$(EXEEXT) $(am__EXEEXT_1)
+ PROGRAMS = $(noinst_PROGRAMS)
+ am__alpha_test_SOURCES_DIST = alpha-test.c utils.c utils.h
+@@ -282,7 +282,7 @@
+ TEST_LDADD = $(top_builddir)/pixman/libpixman-1.la
+ INCLUDES = -I$(top_srcdir)/pixman -I$(top_builddir)/pixman \
+ 	$(am__append_2)
+-TESTPROGRAMS = region-test scaling-test blitters-test fetch-test \
++TESTPROGRAMS = region-test scaling-test fetch-test \
+ 	oob-test window-test trap-crasher $(am__append_1)
+ fetch_test_LDADD = $(TEST_LDADD)
+ region_test_LDADD = $(TEST_LDADD)