diff --git a/mingw-libglade2.spec b/mingw-libglade2.spec
index 51b2844..4906e54 100644
--- a/mingw-libglade2.spec
+++ b/mingw-libglade2.spec
@@ -1,10 +1,8 @@
-%global __strip %{mingw32_strip}
-%global __objdump %{mingw32_objdump}
-%define __debug_install_post %{mingw32_debug_install_post}
+%?mingw_package_header
 
 Name:           mingw-libglade2
 Version:        2.6.4
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        MinGW Windows Libglade2 library
 
 License:        LGPLv2+
@@ -29,6 +27,15 @@ BuildRequires:  mingw32-pango
 BuildRequires:  mingw32-gettext
 BuildRequires:  mingw32-libxml2
 
+BuildRequires:  mingw64-filesystem >= 68
+BuildRequires:  mingw64-gcc
+BuildRequires:  mingw64-binutils
+BuildRequires:  mingw64-gtk2
+BuildRequires:  mingw64-fontconfig
+BuildRequires:  mingw64-pango
+BuildRequires:  mingw64-gettext
+BuildRequires:  mingw64-libxml2
+
 # Native one for msgfmt
 BuildRequires:  gettext
 
@@ -40,6 +47,7 @@ BuildRequires:  autoconf automake libtool
 MinGW Windows Libglade2 library.
 
 
+# Win32
 %package -n mingw32-libglade2
 Summary:        MinGW Windows Libglade2 library
 Requires:       pkgconfig
@@ -55,8 +63,24 @@ Requires:       mingw32-libglade2 = %{version}-%{release}
 %description -n mingw32-libglade2-static
 Static MinGW Windows Libglade2 library.
 
+# Win64
+%package -n mingw64-libglade2
+Summary:        MinGW Windows Libglade2 library
+Requires:       pkgconfig
+
+%description -n mingw64-libglade2
+MinGW Windows Libglade2 library.
+
+%package -n mingw64-libglade2-static
+Summary:        Static MinGW Windows Libglade2 library
+Group:          Development/Libraries
+Requires:       mingw64-libglade2 = %{version}-%{release}
+
+%description -n mingw64-libglade2-static
+Static MinGW Windows Libglade2 library.
+
 
-%{?mingw32_debug_package}
+%?mingw_debug_package
 
 
 %prep
@@ -67,19 +91,27 @@ Static MinGW Windows Libglade2 library.
 
 autoreconf --install --force
 
+
 %build
-%{mingw32_configure} --disable-gtk-doc
-make %{?_smp_mflags}
+%mingw_configure --disable-gtk-doc
+
+cp glade/glade.def build_win32/glade
+cp glade/glade.def build_win64/glade
+
+%mingw_make %{?_smp_mflags}
 
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install
+%mingw_make DESTDIR=$RPM_BUILD_ROOT install
+
 rm -rf $RPM_BUILD_ROOT/%{mingw32_datadir}/gtk-doc/html/libglade
+rm -rf $RPM_BUILD_ROOT/%{mingw64_datadir}/gtk-doc/html/libglade
 
 # Drop all .la files
 find $RPM_BUILD_ROOT -name "*.la" -delete
 
 
+# Win32
 %files -n mingw32-libglade2
 %doc COPYING
 %{mingw32_bindir}/libglade-2.0-0.dll
@@ -94,8 +126,26 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
 %files -n mingw32-libglade2-static
 %{mingw32_libdir}/libglade-2.0.a
 
+# Win64
+%files -n mingw64-libglade2
+%doc COPYING
+%{mingw64_bindir}/libglade-2.0-0.dll
+%{mingw64_bindir}/libglade-convert
+%{mingw64_includedir}/libglade-2.0
+%{mingw64_libdir}/libglade-2.0.dll.a
+%{mingw64_libdir}/pkgconfig/libglade-2.0.pc
+
+%dir %{mingw64_datadir}/xml/libglade
+%{mingw64_datadir}/xml/libglade/glade-2.0.dtd
+
+%files -n mingw64-libglade2-static
+%{mingw64_libdir}/libglade-2.0.a
+
 
 %changelog
+* Sat Apr 14 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 2.6.4-13
+- Added win64 support (contributed by Mikkel Kruse Johnsen)
+
 * Wed Mar 07 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 2.6.4-12
 - Renamed the source package to mingw-libglade2 (RHBZ #800908)
 - Use mingw macros without leading underscore