diff --git a/mingw-w64-tools-2.0.999-s390.patch b/mingw-w64-tools-2.0.999-s390.patch
index 30b8305..81fafd8 100644
--- a/mingw-w64-tools-2.0.999-s390.patch
+++ b/mingw-w64-tools-2.0.999-s390.patch
@@ -1,12 +1,12 @@
 diff -up mingw-w64-v2.0.999/mingw/mingw-w64-tools/widl/include/basetsd.h.s390 mingw-w64-v2.0.999/mingw/mingw-w64-tools/widl/include/basetsd.h
 --- mingw-w64-v2.0.999/mingw/mingw-w64-tools/widl/include/basetsd.h.s390	2012-01-24 11:11:33.000000000 +0100
 +++ mingw-w64-v2.0.999/mingw/mingw-w64-tools/widl/include/basetsd.h	2012-03-28 14:18:17.000000000 +0200
-@@ -36,7 +36,7 @@ extern "C" {
+@@ -36,7 +36,7 @@
   * 64-bit.
   */
  
--#if (defined(__x86_64__) || defined(__powerpc64__) || defined(__sparc64__)) && !defined(_WIN64)
-+#if (defined(__x86_64__) || defined(__powerpc64__) || defined(__sparc64__) || defined(__s390x__)) && !defined(_WIN64)
+-#if (defined(__x86_64__) || defined(__powerpc64__) || defined(__sparc64__) || defined(__aarch64__)) && !defined(_WIN64)
++#if (defined(__x86_64__) || defined(__powerpc64__) || defined(__sparc64__) || defined(__aarch64__) || defined(__s390x__)) && !defined(_WIN64)
  #define _WIN64
  #endif
  
diff --git a/mingw-w64-tools.spec b/mingw-w64-tools.spec
index f05dacf..cac3287 100644
--- a/mingw-w64-tools.spec
+++ b/mingw-w64-tools.spec
@@ -1,15 +1,21 @@
-%global snapshot_date 20120124
+%global snapshot_date 20130403
+%global branch trunk
 
 Name:           mingw-w64-tools
 Version:        2.0.999
-Release:        0.6.trunk.%{snapshot_date}%{?dist}
+Release:        0.7.%{branch}.%{snapshot_date}%{?dist}
 Summary:        Supplementary tools which are part of the mingw-w64 toolchain
 
-License:        Public Domain
+# http://sourceforge.net/mailarchive/forum.php?thread_name=5157C0FC.1010309%40users.sourceforge.net&forum_name=mingw-w64-public
+# The tools gendef and genidl are GPLv3+, widl is LGPLv2+
+License:        GPLv3+ and LGPLv2+
+
 Group:          Development/Libraries
 URL:            http://mingw-w64.sourceforge.net/
 %if 0%{?snapshot_date}
-Source0:        http://sourceforge.net/projects/mingw-w64/files/Toolchain%20sources/Automated%20Builds/mingw-w64-src_%{snapshot_date}.tar.bz2
+# To regerenate a snapshot:
+# wget http://mingw-w64.svn.sourceforge.net/viewvc/mingw-w64/%{branch}/?view=tar -O mingw-w64-%{branch}-snapshot-$(date '+%Y%m%d').tar.gz
+Source0:        mingw-w64-%{branch}-snapshot-%{snapshot_date}.tar.gz
 %else
 Source0:        http://downloads.sourceforge.net/project/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v%{version}.tar.gz
 %endif
@@ -19,7 +25,6 @@ Patch0:         %{name}-2.0.999-s390.patch
 BuildRequires:  mingw32-filesystem >= 95
 BuildRequires:  mingw64-filesystem >= 95
 
-Provides: bundled(libiberty)
 
 %description
 Supplementary tools which are part of the mingw-w64 toolchain
@@ -32,7 +37,7 @@ rm -rf mingw-w64-v%{version}
 mkdir mingw-w64-v%{version}
 cd mingw-w64-v%{version}
 tar -xf %{S:0}
-%setup -q -D -T -n mingw-w64-v%{version}/mingw
+%setup -q -D -T -n mingw-w64-v%{version}/%{branch}
 %else
 %setup -q -n mingw-w64-v%{version}
 %endif
@@ -52,8 +57,20 @@ pushd mingw-w64-tools
     popd
 
     pushd widl
-        %configure
-        make %{?_smp_mflags}
+        # widl needs to be aware of the location of the IDL files belonging
+        # to the toolchain. Therefore it needs to be built for both the win32
+        # and win64 targets
+        %global _configure ../configure
+        mkdir win32
+        pushd win32
+          %configure --target=%{mingw32_target} --program-prefix=%{mingw32_target}-
+          make %{?_smp_mflags}
+        popd
+        mkdir win64
+        pushd win64
+          %configure --target=%{mingw64_target} --program-prefix=%{mingw64_target}-
+          make %{?_smp_mflags}
+        popd
     popd
 popd
 
@@ -62,7 +79,8 @@ popd
 pushd mingw-w64-tools
     make -C gendef DESTDIR=$RPM_BUILD_ROOT install
     make -C genidl DESTDIR=$RPM_BUILD_ROOT install
-    make -C widl DESTDIR=$RPM_BUILD_ROOT install
+    make -C widl/win32 DESTDIR=$RPM_BUILD_ROOT install
+    make -C widl/win64 DESTDIR=$RPM_BUILD_ROOT install
 popd
 
 
@@ -70,10 +88,19 @@ popd
 %doc COPYING
 %{_bindir}/gendef
 %{_bindir}/genidl
-%{_bindir}/mingw-w64-widl
+%{_bindir}/%{mingw32_target}-widl
+%{_bindir}/%{mingw64_target}-widl
 
 
 %changelog
+* Wed Apr  3 2013 Erik van Pienbroek <epienbro@fedoraproject.org> - 2.0.999-0.7.trunk.20130403
+- Update to 20130403 snapshot
+- Use a different source tarball which doesn't contain unrelevant code (like libiberty)
+- Removed Provides: bundled(libiberty)
+- Make sure the widl tool is built for both win32 and win64 toolchains
+- Upstream has changed the license of the gendef and genidl tools to GPLv3+
+  The license of the widl tool is LGPLv2+
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.999-0.6.trunk.20120124
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index c3a96e5..2514557 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9fc9ded15caa57b1fa451cae9aff1ac8  mingw-w64-src_20120124.tar.bz2
+56407c412f1f58f94d9429efd70f3f85  mingw-w64-trunk-snapshot-20130403.tar.gz