diff --git a/mingw-w64-headers-20130216.tar.bz2 b/mingw-w64-headers-20130216.tar.bz2
deleted file mode 100644
index 1a7e3c5..0000000
--- a/mingw-w64-headers-20130216.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8eacb9ca72fa6300bbd3e7202ff660d9d746492027ae75c7f2231a741d172fb1
-size 4219951
diff --git a/mingw-w64-headers-3.1.0.tar.xz b/mingw-w64-headers-3.1.0.tar.xz
new file mode 100644
index 0000000..ebcc58c
--- /dev/null
+++ b/mingw-w64-headers-3.1.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e508175ed31cf60f5245c74670e21221fcda35e3a5588c6c2255e726535225ee
+size 4024112
diff --git a/mingw32-headers.spec b/mingw32-headers.spec
index c16844b..caec986 100644
--- a/mingw32-headers.spec
+++ b/mingw32-headers.spec
@@ -16,58 +16,60 @@
 #
 
 
-%define __os_install_post /usr/lib/rpm/brp-compress %{nil}
-
 Name:           mingw32-headers
-Version:        20130216
+Version:        3.1.0
 Release:        0
-Summary:        MinGW-W64 headers for win32 and win64
+Summary:        MinGW-w64 headers for Win32 and Win64
 License:        SUSE-Public-Domain
-Group:          Development/Libraries
-
-Url:            http://www.mingw.org/
-
-Source0:        mingw-w64-headers-%{version}.tar.bz2
-Source1000:     %{name}-rpmlintrc
+Group:          Development/Libraries/C and C++
+URL:            http://mingw-w64.sf.net/
 
+# Generated from downloadable mingw-w64-%version.tar.bz2
+Source:         mingw-w64-headers-%version.tar.xz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-
 BuildArch:      noarch
-#!BuildIgnore: post-build-checks
-
 BuildRequires:  mingw32-filesystem
+BuildRequires:  xz
+#!BuildIgnore:	post-build-checks
+Requires:       mingw32-unistd-pthread-devel
 
 %description
-MinGW Win64 headers.
+MinGW-w64 delivers runtime, headers and libs for developing both 64
+bit (x64) and 32 bit (x86) windows applications using GCC and other
+free software compilers.
 
+This subpackage contains the header files.
+
+%package dummy-pthread
+Summary:	Stub pthread header files for MinGW
+Group:		Development/Libraries/C and C++
+Provides:	mingw32-unistd-pthread-devel
+
+%description dummy-pthread
+This subpackage contains stub pthread header files that are empty
+and only exist to satisfy dependencies in MinGW's unistd.h until
+an actual pthread implementation (like winpthreads) is installed.
 
 %prep
-%setup -q -n mingw-w64-headers-%{version}
+%setup -qn mingw-w64-headers
 
 %build
-%{_mingw32_configure} \
+%_mingw32_configure \
 	--with-sdk=all \
 	--enable-secure-api
-
-make
+make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{_mingw32_target}
-mkdir -p $RPM_BUILD_ROOT%{_mingw32_includedir}
-ln -s $RPM_BUILD_ROOT%{_mingw32_includedir} \
-$RPM_BUILD_ROOT%{_prefix}/%{_mingw32_target}/include
-
-make DESTDIR=$RPM_BUILD_ROOT install
-
-rm -f $RPM_BUILD_ROOT%{_prefix}/%{_mingw32_target}/include
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+make DESTDIR="%buildroot" install
 
 %files
 %defattr(-,root,root)
-%dir %{_prefix}/%{_mingw32_target}
-%{_mingw32_sysroot}
+%_mingw32_includedir/
+%exclude %_mingw32_includedir/pthread_*.h
+
+%files dummy-pthread
+%defattr(-,root,root)
+%dir %_mingw32_includedir
+%_mingw32_includedir/pthread_*.h
 
 %changelog