diff --git a/mingw-pixman.spec b/mingw-pixman.spec
index e13df78..bb5394f 100644
--- a/mingw-pixman.spec
+++ b/mingw-pixman.spec
@@ -1,10 +1,11 @@
-%global __strip %{mingw32_strip}
-%global __objdump %{mingw32_objdump}
-%define __debug_install_post %{mingw32_debug_install_post}
+%?mingw_package_header
+
+%global mingw_build_win32 1
+%global mingw_build_win64 1
 
 Name:           mingw-pixman
 Version:        0.24.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        MinGW Windows Pixman library
 
 License:        MIT
@@ -16,15 +17,20 @@ Source1:        make-pixman-snapshot.sh
 
 BuildArch:      noarch
 
-BuildRequires:  mingw32-filesystem >= 68
+BuildRequires:  mingw32-filesystem >= 95
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
-BuildRequires:  mingw32-dlfcn
+
+BuildRequires:  mingw64-filesystem >= 95
+BuildRequires:  mingw64-gcc
+BuildRequires:  mingw64-binutils
+
 
 %description
 MinGW Windows Pixman library.
 
 
+# Win32
 %package -n mingw32-pixman
 Summary:        MinGW Windows Pixman library
 
@@ -40,8 +46,22 @@ Group:          Development/Libraries
 %description -n mingw32-pixman-static
 Static version of the MinGW Windows Pixman library.
 
+# Win64
+%package -n mingw64-pixman
+Summary:        MinGW Windows Pixman library
+
+%description -n mingw64-pixman
+MinGW Windows Pixman library.
+
+%package -n mingw64-pixman-static
+Summary:        Static version of the cross compiled Pixman library
+Requires:       mingw64-pixman = %{version}-%{release}
+
+%description -n mingw64-pixman-static
+Static version of the cross compiled Pixman library.
 
-%{?mingw32_debug_package}
+
+%?mingw_debug_package
 
 
 %prep
@@ -51,15 +71,18 @@ Static version of the MinGW Windows Pixman library.
 %build
 # Uses GTK for its testsuite, so disable this otherwise
 # we have a chicken & egg problem on mingw
-%{mingw32_configure} --disable-gtk --enable-static --enable-shared
-make %{?_smp_mflags} V=1
+%mingw_configure --disable-gtk --enable-static --enable-shared
+%mingw_make %{?_smp_mflags}
 
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install
-rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/*.la
+%mingw_make_install DESTDIR=$RPM_BUILD_ROOT
+
+# Drop all .la files
+find $RPM_BUILD_ROOT -name "*.la" -delete
 
 
+# Win32
 %files -n mingw32-pixman
 %doc COPYING
 %{mingw32_bindir}/libpixman-1-0.dll
@@ -67,12 +90,26 @@ rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/*.la
 %{mingw32_libdir}/libpixman-1.dll.a
 %{mingw32_libdir}/pkgconfig/pixman-1.pc
 
-
 %files -n mingw32-pixman-static
 %{mingw32_libdir}/libpixman-1.a
 
+# Win64
+%files -n mingw64-pixman
+%doc COPYING
+%{mingw64_bindir}/libpixman-1-0.dll
+%{mingw64_includedir}/pixman-1
+%{mingw64_libdir}/libpixman-1.dll.a
+%{mingw64_libdir}/pkgconfig/pixman-1.pc
+
+%files -n mingw64-pixman-static
+%{mingw64_libdir}/libpixman-1.a
+
 
 %changelog
+* Sat Mar 10 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 0.24.4-3
+- Added win64 support
+- Dropped unneeded BR: mingw32-dlfcn
+
 * Tue Mar 06 2012 Kalev Lember <kalevlember@gmail.com> - 0.24.4-2
 - Renamed the source package to mingw-pixman (#800445)
 - Use mingw macros without leading underscore