diff --git a/.gitignore b/.gitignore
index ce998a7..b1d0b47 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 libgpg-error-1.6.tar.bz2
+/libgpg-error-1.10.tar.bz2
diff --git a/libgpg-error-1.10.tar.bz2.sig b/libgpg-error-1.10.tar.bz2.sig
new file mode 100644
index 0000000..5b22458
Binary files /dev/null and b/libgpg-error-1.10.tar.bz2.sig differ
diff --git a/libgpg-error-1.6.tar.bz2.sig b/libgpg-error-1.6.tar.bz2.sig
deleted file mode 100644
index f9e7708..0000000
Binary files a/libgpg-error-1.6.tar.bz2.sig and /dev/null differ
diff --git a/libgpg-error-fix-invalid-def-file.patch b/libgpg-error-fix-invalid-def-file.patch
deleted file mode 100644
index 92a27ff..0000000
--- a/libgpg-error-fix-invalid-def-file.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- src/gpg-error.def.orig	2012-02-27 23:38:14.864838661 +0100
-+++ src/gpg-error.def	2012-02-27 23:39:24.325103071 +0100
-@@ -1,4 +1,3 @@
--
- EXPORTS
-  gpg_strerror             @1
-  gpg_strerror_r           @2  
diff --git a/mingw-libgpg-error.spec b/mingw-libgpg-error.spec
index 2fe4f89..5445842 100644
--- a/mingw-libgpg-error.spec
+++ b/mingw-libgpg-error.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-libgpg-error
-Version:        1.6
-Release:        17%{?dist}
+Version:        1.10
+Release:        1%{?dist}
 Summary:        MinGW Windows GnuPGP error library
 
 License:        LGPLv2+
@@ -15,16 +16,18 @@ Source1:        ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-%{version}.
 Source2:        wk@g10code.com
 BuildArch:      noarch
 
-# Binutils isn't able to process the .def file. Fix this
-Patch0:         libgpg-error-fix-invalid-def-file.patch
-
-BuildRequires:  mingw32-filesystem >= 49
+BuildRequires:  mingw32-filesystem >= 95
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
-BuildRequires:  mingw32-dlfcn
-BuildRequires:  mingw32-iconv
+BuildRequires:  mingw32-win-iconv
 BuildRequires:  mingw32-gettext
 
+BuildRequires:  mingw64-filesystem >= 95
+BuildRequires:  mingw64-gcc
+BuildRequires:  mingw64-binutils
+BuildRequires:  mingw64-win-iconv
+BuildRequires:  mingw64-gettext
+
 BuildRequires:  gettext
 
 
@@ -33,37 +36,48 @@ MinGW Windows GnuPGP error library.
 
 
 %package -n mingw32-libgpg-error
-Summary:         MinGW Windows zlib compression library for the win32 target
+Summary:        MinGW Windows zlib compression library for the win32 target
 
 %description -n mingw32-libgpg-error
 MinGW Windows GnuPGP error library.
 
+%package -n mingw64-libgpg-error
+Summary:        MinGW Windows zlib compression library for the win32 target
+
+%description -n mingw64-libgpg-error
+MinGW Windows GnuPGP error library.
+
 
-%{mingw32_debug_package}
+%?mingw_debug_package
 
 
 %prep
 %setup -q -n libgpg-error-%{version}
-%patch0 -p0
 
 
 %build
-%{mingw32_configure}
-make %{?_smp_mflags}
+%mingw_configure
 
+# Workaround a bug in libtool: http://savannah.gnu.org/support/?107959
+make -C build_win32/src gpg-error.def
+sed -i '/^$/d' build_win32/src/gpg-error.def
+
+make -C build_win64/src gpg-error.def
+sed -i '/^$/d' build_win64/src/gpg-error.def
+
+%mingw_make %{?_smp_mflags}
 
-%install
-make DESTDIR=$RPM_BUILD_ROOT install
 
-rm $RPM_BUILD_ROOT%{mingw32_libdir}/libgpg-error.a
+%install
+%mingw_make_install DESTDIR=$RPM_BUILD_ROOT
 
 # Drop all .la files
 find $RPM_BUILD_ROOT -name "*.la" -delete
 
-%find_lang libgpg-error
+%mingw_find_lang libgpg-error
 
 
-%files -n mingw32-libgpg-error -f libgpg-error.lang
+%files -n mingw32-libgpg-error -f mingw32-libgpg-error.lang
 %{mingw32_bindir}/gpg-error-config
 %{mingw32_bindir}/gpg-error.exe
 %{mingw32_bindir}/libgpg-error-0.dll
@@ -72,8 +86,21 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
 %{mingw32_datadir}/aclocal/gpg-error.m4
 %{mingw32_datadir}/common-lisp/source/gpg-error/*
 
+%files -n mingw64-libgpg-error -f mingw64-libgpg-error.lang
+%{mingw64_bindir}/gpg-error-config
+%{mingw64_bindir}/gpg-error.exe
+%{mingw64_bindir}/libgpg-error-0.dll
+%{mingw64_libdir}/libgpg-error.dll.a
+%{mingw64_includedir}/gpg-error.h
+%{mingw64_datadir}/aclocal/gpg-error.m4
+%{mingw64_datadir}/common-lisp/source/gpg-error/*
+
 
 %changelog
+* Sat Mar 10 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 1.10-1
+- Update to 1.10
+- Added win64 support
+
 * Wed Mar 07 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 1.6-17
 - Renamed the source package to mingw-libgpg-error (RHBZ #800913)
 - Use mingw macros without leading underscore
diff --git a/sources b/sources
index 34ba30d..54fb0c8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f3e9870e213518b407a959f8d29cd554  libgpg-error-1.6.tar.bz2
+736a03daa9dc5873047d4eb4a9c22a16  libgpg-error-1.10.tar.bz2