diff --git a/.gitignore b/.gitignore
index 45bbb58..607353e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@
 /mingw-w64-trunk-r5894-snapshot-20130614.zip
 /mingw-w64-trunk-r5904-snapshot-20130614.zip
 /mingw-w64-code-5915-trunk.zip
+/mingw-w64-code-5949-trunk.zip
diff --git a/mingw-crt.spec b/mingw-crt.spec
index 6d938f3..5027ae9 100644
--- a/mingw-crt.spec
+++ b/mingw-crt.spec
@@ -1,12 +1,12 @@
 %{?mingw_package_header}
 
-%global snapshot_date 20130628
-%global snapshot_rev 5915
+%global snapshot_date 20130713
+%global snapshot_rev 5949
 %global branch trunk
 
 Name:           mingw-crt
 Version:        2.0.999
-Release:        0.28.%{branch}.r%{snapshot_rev}.%{snapshot_date}%{?dist}
+Release:        0.29.%{branch}.r%{snapshot_rev}.%{snapshot_date}%{?dist}
 Summary:        MinGW Windows cross-compiler runtime
 
 License:        Public Domain and ZPLv2.1
@@ -35,20 +35,6 @@ BuildRequires:  mingw64-binutils
 BuildRequires:  mingw64-headers
 BuildRequires:  mingw64-gcc
 
-# Required for patch0
-BuildRequires:  autoconf automake libtool
-
-# Revert r5713 for now as it causes shared libraries
-# without an explicit exported symbols list (.def file) to
-# automatically export the symbol InterlockedCompareExchange.
-# This symbol is part of the Win32 API so it shouldn't
-# be exported again in individual shared libraries.
-# This issue only happens for the i686-w64-mingw32 target.
-# We reported this issue upstream on 2013-05-23 but we're
-# still waiting on a proper solution. To workaround it
-# we do a partial revert the commit in question for now
-Patch0:         mingw-w64-workaround-ilockcxch-regression.patch
-
 
 %description
 MinGW Windows cross-compiler runtime, base libraries.
@@ -84,9 +70,6 @@ unzip %{S:0}
 %setup -q -n mingw-w64-v%{version}
 %endif
 
-%patch0 -p0 -b .ilockcxch_regression
-autoreconf -i --force
-
 
 %build
 pushd mingw-w64-crt
@@ -116,6 +99,10 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_includedir}/*.c
 
 
 %changelog
+* Sat Jul 13 2013 Erik van Pienbroek <epienbro@fedoraproject.org> - 2.0.999-0.29.trunk.r5949.20130713
+- Update to r5949 (20130713 snapshot)
+- Dropped InterlockedCompareExchange workaround, issue is resolved upstream (with r5949)
+
 * Fri Jun 28 2013 Erik van Pienbroek <epienbro@fedoraproject.org> - 2.0.999-0.28.trunk.r5915.20130628
 - Update to r5915 (20130628 snapshot)
 
diff --git a/mingw-w64-workaround-ilockcxch-regression.patch b/mingw-w64-workaround-ilockcxch-regression.patch
deleted file mode 100644
index 75dd36e..0000000
--- a/mingw-w64-workaround-ilockcxch-regression.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- mingw-w64-crt/Makefile.am.ilockcxch_regression	2013-06-14 22:43:42.000000000 +0200
-+++ mingw-w64-crt/Makefile.am	2013-06-15 00:04:25.812271438 +0200
-@@ -158,7 +158,7 @@
-   secapi/wmemcpy_s.c
- 
- 
--src_libmingwex=\
-+src_libmingwex=intrincs/ilockcxch.c intrincs/ilockcxch2.c\
-   crt/dllentry.c        crt/dllmain.c \
-   \
-   complex/cabs.c     complex/cabsf.c    complex/cabsl.c   complex/cacos.c    complex/cacosf.c   complex/cacosl.c \
-@@ -263,7 +263,6 @@
-   intrincs/bittest.c        intrincs/bittestc.c       intrincs/bittestci.c       intrincs/bittestr.c      intrincs/bittestri.c      \
-   intrincs/bittests.c       intrincs/bittestsi.c      intrincs/cpuid.c           intrincs/currentfiber.c  intrincs/currentteb.c     \
-   intrincs/fiberdata.c      intrincs/ilockadd.c       intrincs/ilockand.c        intrincs/ilockand64.c \
--  intrincs/ilockcxch.c      intrincs/ilockcxch2.c \
-   intrincs/ilockcxch16.c    intrincs/ilockcxch64.c    intrincs/ilockcxchptr.c    intrincs/ilockdec.c      intrincs/ilockdec16.c     \
-   intrincs/ilockdec64.c     intrincs/ilockexch.c      intrincs/ilockexch64.c     intrincs/ilockexchadd.c  intrincs/ilockexchadd64.c \
-   intrincs/ilockexchptr.c   intrincs/ilockinc.c       intrincs/ilockinc16.c      intrincs/ilockinc64.c    intrincs/ilockor.c        \
diff --git a/sources b/sources
index 655601e..68da209 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c4ba2c2b8f27614dc8788c31357924c5  mingw-w64-code-5915-trunk.zip
+1f7dc963a82bc1fb00566d257355520c  mingw-w64-code-5949-trunk.zip