diff --git a/mingw-freetype.spec b/mingw-freetype.spec
index b4e421f..3f48382 100644
--- a/mingw-freetype.spec
+++ b/mingw-freetype.spec
@@ -1,6 +1,7 @@
-%define __strip %{mingw32_strip}
-%define __objdump %{mingw32_objdump}
-%define __debug_install_post %{mingw32_debug_install_post}
+%?mingw_package_header
+
+%global mingw_build_win32 1
+%global mingw_build_win64 1
 
 # Patented subpixel rendering disabled by default.
 # Pass '--with subpixel_rendering' on rpmbuild command-line to enable.
@@ -8,7 +9,7 @@
 
 Name:           mingw-freetype
 Version:        2.4.8
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Free and portable font rendering engine
 
 License:        FTL or GPLv2+
@@ -26,23 +27,36 @@ Patch88:        freetype-multilib.patch
 
 BuildArch:      noarch
 
-BuildRequires:  mingw32-filesystem >= 68
+BuildRequires:  mingw32-filesystem >= 95
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
 BuildRequires:  mingw32-zlib
-BuildRequires:  mingw32-dlfcn
+
+BuildRequires:  mingw64-filesystem >= 95
+BuildRequires:  mingw64-gcc
+BuildRequires:  mingw64-binutils
+BuildRequires:  mingw64-zlib
+
 
 %description
 MinGW Windows Freetype library.
 
+# Win32
 %package -n mingw32-freetype
-Summary:         Free and portable font rendering engine
+Summary:        Free and portable font rendering engine
 
 %description -n mingw32-freetype
 MinGW Windows Freetype library.
 
+# Win64
+%package -n mingw64-freetype
+Summary:        Free and portable font rendering engine
 
-%{?mingw32_debug_package}
+%description -n mingw64-freetype
+MinGW Windows Freetype library.
+
+
+%?mingw_debug_package
 
 
 %prep
@@ -59,8 +73,8 @@ MinGW Windows Freetype library.
 
 
 %build
-%{mingw32_configure} --disable-static
-make %{?_smp_mflags}
+%mingw_configure --disable-static
+%mingw_make %{?_smp_mflags}
 
 # The ft2demos Makefile is hacky and doesn't understand
 # cross-compilation.  This nearly works, but not quite, so
@@ -71,8 +85,10 @@ make %{?_smp_mflags}
 
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install
-rm $RPM_BUILD_ROOT%{mingw32_libdir}/*.la
+%mingw_make_install DESTDIR=$RPM_BUILD_ROOT
+
+# Drop all .la files
+find $RPM_BUILD_ROOT -name "*.la" -delete
 
 
 %files -n mingw32-freetype
@@ -85,8 +101,21 @@ rm $RPM_BUILD_ROOT%{mingw32_libdir}/*.la
 %{mingw32_libdir}/pkgconfig/freetype2.pc
 %{mingw32_datadir}/aclocal/freetype2.m4
 
+%files -n mingw64-freetype
+%doc docs/LICENSE.TXT
+%{mingw64_bindir}/freetype-config
+%{mingw64_bindir}/libfreetype-6.dll
+%{mingw64_includedir}/freetype2
+%{mingw64_includedir}/ft2build.h
+%{mingw64_libdir}/libfreetype.dll.a
+%{mingw64_libdir}/pkgconfig/freetype2.pc
+%{mingw64_datadir}/aclocal/freetype2.m4
+
 
 %changelog
+* Sat Mar 10 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 2.4.8-5
+- Added win64 support
+
 * Fri Mar 09 2012 Kalev Lember <kalevlember@gmail.com> - 2.4.8-4
 - Remove .la files