diff --git a/.gitignore b/.gitignore
index a2c269e..454f5ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,4 @@
 /mingw-w64-code-6228-trunk.zip
 /mingw-w64-code-6230-trunk.zip
 /mingw-w64-code-6233-trunk.zip
+/mingw-w64-code-6258-trunk.zip
diff --git a/mingw-headers.spec b/mingw-headers.spec
index af55392..1fe1148 100644
--- a/mingw-headers.spec
+++ b/mingw-headers.spec
@@ -1,5 +1,5 @@
-%global snapshot_date 20130907
-%global snapshot_rev 6233
+%global snapshot_date 20130909
+%global snapshot_rev 6258
 %global branch trunk
 
 # The mingw-w64-headers provide the headers pthread_time.h
@@ -14,7 +14,7 @@
 
 Name:           mingw-headers
 Version:        2.0.999
-Release:        0.35.%{branch}.r%{snapshot_rev}.%{snapshot_date}%{?dist}
+Release:        0.36.%{branch}.r%{snapshot_rev}.%{snapshot_date}%{?dist}
 Summary:        Win32/Win64 header files
 
 License:        Public Domain and LGPLv2+ and ZPLv2.1
@@ -110,6 +110,11 @@ rm -f $RPM_BUILD_ROOT%{mingw64_includedir}/pthread_unistd.h
 
 
 %changelog
+* Mon Sep  9 2013 Erik van Pienbroek <epienbro@fedoraproject.org> - 2.0.999-0.36.trunk.r6258.20130909
+- Update to r6258 (20130909 snapshot)
+- Fixes various UOW related build failures
+- Fixed multiple definition of FreeIDListArray failures
+
 * Sat Sep  7 2013 Erik van Pienbroek <epienbro@fedoraproject.org> - 2.0.999-0.35.trunk.r6233.20130907
 - Update to r6233 (20130907 snapshot)
 - Fix compatibility with latest mingw-winpthreads
diff --git a/sources b/sources
index 9826b1b..9f42d06 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c0d6ed89193dff364789913c98470d7f  mingw-w64-code-6233-trunk.zip
+249a0e39201db22d0579ab6700524623  mingw-w64-code-6258-trunk.zip