diff --git a/mingw-w64-headers-0.0.20090916.tar.bz2 b/mingw-w64-headers-0.0.20090916.tar.bz2
deleted file mode 100644
index 98df042..0000000
--- a/mingw-w64-headers-0.0.20090916.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:deca430e2344e1425873ada396e689faed1d949af8512ec1c2e263602f363677
-size 3010658
diff --git a/mingw-w64-headers-1.0b.tar.bz2 b/mingw-w64-headers-1.0b.tar.bz2
new file mode 100644
index 0000000..3f1de35
--- /dev/null
+++ b/mingw-w64-headers-1.0b.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bd7a3f8a944ddde498b74726f9c88ee9a014446acf9de0f4d4c8f125aea542ce
+size 2970702
diff --git a/mingw64-headers-0.0.20090916-rpmlintrc b/mingw64-headers-1.0b-rpmlintrc
similarity index 100%
rename from mingw64-headers-0.0.20090916-rpmlintrc
rename to mingw64-headers-1.0b-rpmlintrc
diff --git a/mingw64-headers.spec b/mingw64-headers.spec
index e81b68c..6b658c6 100644
--- a/mingw64-headers.spec
+++ b/mingw64-headers.spec
@@ -1,15 +1,15 @@
 %define __os_install_post /usr/lib/rpm/brp-compress %{nil}
 
 Name:           mingw64-headers
-Version:        0.0.20090916
+Version:        1.0b
 Release:        0
-Summary:        MinGW Win64 headers
+Summary:        MinGW-W64 headers for win32 and win64
 
 Group:          Development/Libraries
 License:        Public Domain
 URL:            http://www.mingw.org/
 
-Source0:        http://dl.sourceforge.net/sourceforge/mingw-w64/mingw-w64-headers-%{version}.tar.bz2
+Source0:        mingw-w64-headers-%{version}.tar.bz2
 Source1000:		%{name}-%{version}-rpmlintrc
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -24,23 +24,25 @@ MinGW Win64 headers.
 
 
 %prep
-%setup -q -c
+%setup -q -n mingw-w64-headers-%{version}
 
 %build
-rm -rf %{_mingw64_target}
-
-# Setup sys-root.
-mkdir -p %{_mingw64_target}/sys-root/mingw
-cp -a mingw-w64-headers/include %{_mingw64_target}/sys-root/mingw
-cp -a mingw-w64-headers/direct-x/include/* %{_mingw64_target}/sys-root/mingw/include/
+./configure --host=%{_mingw64_target} \
+	--prefix=%{_prefix} \
+	--with-sdk=all
 
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{_mingw64_target}
+mkdir -p $RPM_BUILD_ROOT%{_mingw64_includedir}
+ln -s $RPM_BUILD_ROOT%{_mingw64_includedir} \
+$RPM_BUILD_ROOT%{_prefix}/%{_mingw64_target}/include
 
-mkdir -p $RPM_BUILD_ROOT%{_prefix}
-cp -a %{_mingw64_target} $RPM_BUILD_ROOT%{_prefix}
+make DESTDIR=$RPM_BUILD_ROOT install
 
+rm -f $RPM_BUILD_ROOT%{_prefix}/%{_mingw64_target}/include
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -48,8 +50,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%dir %{_prefix}/x86_64-pc-mingw32
-%{_prefix}/x86_64-pc-mingw32/sys-root
+%dir %{_prefix}/%{_mingw64_target}
+%{_mingw64_sysroot}
 
 
 %changelog