diff --git a/mingw-w64-crt-5.0.4.tar.xz b/mingw-w64-crt-5.0.4.tar.xz
deleted file mode 100644
index 3c29c55..0000000
--- a/mingw-w64-crt-5.0.4.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:50734998442cdfd7f53440e89caac7949bcd3ebf066d1d1d58ef0e2293fb6307
-size 1573972
diff --git a/mingw-w64-crt-6.0.0.tar.xz b/mingw-w64-crt-6.0.0.tar.xz
new file mode 100644
index 0000000..163b800
--- /dev/null
+++ b/mingw-w64-crt-6.0.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:21b4280c4f1c0b5376934a8c303e695a23b6e4537f5f9acbdf58d3e985c898e9
+size 1470884
diff --git a/mingw64-runtime.changes b/mingw64-runtime.changes
index 323ffad..7df1047 100644
--- a/mingw64-runtime.changes
+++ b/mingw64-runtime.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Wed Oct 17 18:50:03 UTC 2018 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to new upstream release 6.0.0
+  * C++ __cxa_atexit
+  * Massive additions to support UCRT
+  * Sync COM interface headers with Wine development
+  * WinRT additions
+  * ARM32 and ARM64 additions
+  * CRT library api-ms-win-core additions
+  * CRT library def file reorganization
+- Removed popcnt.patch, 0001-Add-missing-D3D_CS_-variables.patch
+  (no longer needed; included upstream)
+
 -------------------------------------------------------------------
 Tue Nov 21 11:38:40 UTC 2017 - idonmez@suse.com
 
diff --git a/mingw64-runtime.spec b/mingw64-runtime.spec
index 3d6ed5d..eaed018 100644
--- a/mingw64-runtime.spec
+++ b/mingw64-runtime.spec
@@ -17,16 +17,17 @@
 
 
 Name:           mingw64-runtime
-Version:        5.0.4
+Version:        6.0.0
 Release:        0
 Summary:        MinGW-w64 runtime libraries for Win64
 License:        SUSE-Public-Domain
 Group:          Development/Libraries/C and C++
 Url:            http://mingw-w64.sf.net/
 
-#DL-URL:	http://downloads.sf.net/mingw-w64/mingw-w64-v5.0.3.tar.bz2
+#DL-URL:	http://downloads.sf.net/mingw-w64/mingw-w64-v%%version.tar.bz2
+# Unpack DL-URL and re-tar the "mingw64-headers" directory
 Source:         mingw-w64-crt-%version.tar.xz
-Source100:      %{name}-rpmlintrc
+Source100:      %name-rpmlintrc
 #!BuildIgnore: post-build-checks
 BuildRequires:  mingw64-cross-binutils
 BuildRequires:  mingw64-cross-gcc-bootstrap >= 4.4.0
@@ -41,9 +42,9 @@ Requires:       mingw64-headers <= %version
 # Once this is installed, mingw64-bootstrap (binary bootstrapper) is no
 # longer needed.
 Obsoletes:      mingw64-runtime-bootstrap
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRoot:      %_tmppath/%name-%version-build
 BuildArch:      noarch
-%{_mingw64_package_header}
+%_mingw64_package_header
 
 %description
 MinGW Win64 cross-compiler runtime, base libraries.
@@ -52,15 +53,15 @@ MinGW Win64 cross-compiler runtime, base libraries.
 %setup -q -n mingw-w64-crt
 
 %build
-%{_mingw64_configure} --disable-lib32 --enable-lib64
+%_mingw64_configure --disable-lib32 --enable-lib64
 make %{?_smp_mflags}
 
 %install
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
-rm -Rfv "%{buildroot}/%{_mingw64_includedir}"/*.c
+%make_install
+rm -Rfv "%buildroot/%_mingw64_includedir"/*.c
 
 %files
 %defattr(-,root,root)
-%{_mingw64_libdir}/
+%_mingw64_libdir/
 
 %changelog