diff --git a/mingw-w64-headers-4.0.2.tar.xz b/mingw-w64-headers-4.0.2.tar.xz
deleted file mode 100644
index 3a5207e..0000000
--- a/mingw-w64-headers-4.0.2.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bf1ada6ac130cdd01a1b0d9248c8c9d5729c2a010701f7114449a3342bed7852
-size 5081128
diff --git a/mingw-w64-headers-4.0.4.tar.xz b/mingw-w64-headers-4.0.4.tar.xz
new file mode 100644
index 0000000..70f37cf
--- /dev/null
+++ b/mingw-w64-headers-4.0.4.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ab8f4751f8e8bb4c16710bf42d3094d3f44361df1b56a5239327a33eecb03223
+size 5461128
diff --git a/mingw64-headers.changes b/mingw64-headers.changes
index 3f60cf6..c184a6c 100644
--- a/mingw64-headers.changes
+++ b/mingw64-headers.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Sep  4 11:50:23 UTC 2015 - idonmez@suse.com
+
+- Update to version 4.0.4
+  * Fixes to tchar.h
+- Remove order.diff, upstream
+
 -------------------------------------------------------------------
 Tue Apr 21 09:00:58 UTC 2015 - jengelh@inai.de
 
diff --git a/mingw64-headers.spec b/mingw64-headers.spec
index e9b1dd5..0bcd00b 100644
--- a/mingw64-headers.spec
+++ b/mingw64-headers.spec
@@ -17,7 +17,7 @@
 
 
 Name:           mingw64-headers
-Version:        4.0.2
+Version:        4.0.4
 Release:        0
 Summary:        MinGW-w64 headers for Win32 and Win64
 License:        SUSE-Public-Domain
@@ -27,7 +27,6 @@ Url:            http://mingw-w64.sf.net/
 #DL-URL:	http://downloads.sf.net/mingw-w64/mingw-w64-%version.tar.bz2
 Source:         mingw-w64-headers-%version.tar.xz
 Source9:        %name-rpmlintrc
-Patch1:         order.diff
 BuildRequires:  mingw64-filesystem
 BuildRequires:  xz
 #!BuildIgnore:	post-build-checks
@@ -54,7 +53,6 @@ an actual pthread implementation (like winpthreads) is installed.
 
 %prep
 %setup -q -n mingw-w64-headers
-%patch -P 1 -p1
 
 %build
 %{_mingw64_configure} \
diff --git a/order.diff b/order.diff
deleted file mode 100644
index 8381d37..0000000
--- a/order.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Jan Engelhardt <jengelh@inai.de>
-Date: 2015-03-26 10:55:28.730890877 +0100
-References: https://sourceforge.net/p/mingw-w64/bugs/476/
-
-In downstream packages, gcc emits:
-   CC       master.o
- In file included from master.c:48:0:
- /usr/x86_64-w64-mingw32/sys-root/mingw/include/shlobj.h:37:3: error: unknown type name 'EXTERN_C'
-    SHFOLDERAPI SHGetFolderPathW (HWND hwnd, int csidl, HANDLE hToken, DWORD dwFlags, LPWSTR pszPath);
-
-SHLFOLDERAPI is defined to expand to something with EXTERN_C,
-however, EXTERN_C is not defined at the time of SHGetFolderPathW
-declaration.
----
- include/shlobj.h |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: mingw-w64-headers/include/shlobj.h
-===================================================================
---- mingw-w64-headers.orig/include/shlobj.h
-+++ mingw-w64-headers/include/shlobj.h
-@@ -34,7 +34,6 @@ typedef enum {
-   SHGFP_TYPE_DEFAULT = 1,
- } SHGFP_TYPE;
- 
--  SHFOLDERAPI SHGetFolderPathW (HWND hwnd, int csidl, HANDLE hToken, DWORD dwFlags, LPWSTR pszPath);
- 
- #endif
- 
-@@ -718,6 +717,7 @@ extern "C" {
-   SHSTDAPI_(void) SHFlushSFCache (void);
- 
-   SHFOLDERAPI SHGetFolderPathA (HWND hwnd, int csidl, HANDLE hToken, DWORD dwFlags, LPSTR pszPath);
-+  SHFOLDERAPI SHGetFolderPathW (HWND hwnd, int csidl, HANDLE hToken, DWORD dwFlags, LPWSTR pszPath);
-   SHSTDAPI SHGetFolderLocation (HWND hwnd, int csidl, HANDLE hToken, DWORD dwFlags, PIDLIST_ABSOLUTE *ppidl);
-   SHSTDAPI SHSetFolderPathA (int csidl, HANDLE hToken, DWORD dwFlags, LPCSTR pszPath);
-   SHSTDAPI SHSetFolderPathW (int csidl, HANDLE hToken, DWORD dwFlags, LPCWSTR pszPath);