diff --git a/boost-1.54.0-thread-link_atomic.patch b/boost-1.54.0-thread-link_atomic.patch
new file mode 100644
index 0000000..e9c6dd8
--- /dev/null
+++ b/boost-1.54.0-thread-link_atomic.patch
@@ -0,0 +1,51 @@
+diff -Nurp boost_1_54_0/libs/thread/build/has_atomic_flag_lockfree_test.cpp boost_1_54_0.pm/libs/thread/build/has_atomic_flag_lockfree_test.cpp
+--- boost_1_54_0/libs/thread/build/has_atomic_flag_lockfree_test.cpp	1970-01-01 01:00:00.000000000 +0100
++++ boost_1_54_0.pm/libs/thread/build/has_atomic_flag_lockfree_test.cpp	2013-08-23 19:51:52.706329968 +0200
+@@ -0,0 +1,14 @@
++// Copyright (c) 2013, Petr Machata, Red Hat Inc.
++//
++// Use modification and distribution are subject to the boost Software
++// License, Version 1.0.  (See http://www.boost.org/LICENSE_1_0.txt).
++
++#include "../../../boost/atomic.hpp"
++#include "../../../boost/static_assert.hpp"
++
++int
++main(int argc, char *argv[])
++{
++  BOOST_STATIC_ASSERT(BOOST_ATOMIC_FLAG_LOCK_FREE);
++  return 0;
++}
+diff -Nurp boost_1_54_0/libs/thread/build/Jamfile.v2 boost_1_54_0.pm/libs/thread/build/Jamfile.v2
+--- boost_1_54_0/libs/thread/build/Jamfile.v2	2013-06-15 12:35:45.000000000 +0200
++++ boost_1_54_0.pm/libs/thread/build/Jamfile.v2	2013-08-23 19:52:30.018613408 +0200
+@@ -36,6 +36,7 @@ import os ;
+ import feature ;
+ import indirect ;
+ import path ;
++import configure ;
+ 
+ project boost/thread
+     : source-location ../src
+@@ -140,6 +141,8 @@ local rule default_threadapi ( )
+ feature.feature threadapi : pthread win32 : propagated ;
+ feature.set-default threadapi : [ default_threadapi ] ;
+ 
++exe has_atomic_flag_lockfree : ../build/has_atomic_flag_lockfree_test.cpp ;
++
+ rule tag ( name : type ? : property-set )
+ {
+     local result = $(name) ;
+@@ -248,6 +251,12 @@ rule requirements ( properties * )
+ {
+     local result ;
+ 
++    if ! [ configure.builds has_atomic_flag_lockfree
++	   : $(properties) : "lockfree boost::atomic_flag" ]
++    {
++        result += <library>/boost/atomic//boost_atomic ;
++    }
++
+     if <threadapi>pthread in $(properties)
+     {
+         result += <define>BOOST_THREAD_POSIX ;
diff --git a/boost.changes b/boost.changes
index 7372016..d5ed06a 100644
--- a/boost.changes
+++ b/boost.changes
@@ -3,6 +3,13 @@ Sat Feb  8 18:06:12 CET 2014 - pth@suse.de
 
 - Add post and postun sections for libboost_graph_parallel.
 
+-------------------------------------------------------------------
+Fri Feb  7 14:48:30 CET 2014 - ro@suse.de
+
+- add boost-1.54.0-thread-link_atomic.patch fixing upstream issue
+  https://svn.boost.org/trac/boost/ticket/9041
+  (fixes compilation failure of snapper on various platforms) 
+
 -------------------------------------------------------------------
 Wed Feb  5 13:58:30 CET 2014 - ro@suse.de
 
diff --git a/boost.spec b/boost.spec
index 907ee73..6199808 100644
--- a/boost.spec
+++ b/boost.spec
@@ -117,6 +117,8 @@ Patch72:        boost-1.54-002-date-time.patch
 Patch73:        boost-1.54-003-log.patch
 #PATCH-FIX-UPSTREAM https://svn.boost.org/trac/boost/ticket/8790
 Patch74:        boost-1.54-change85160.patch
+#PATCH-FIX-UPSTREAM https://svn.boost.org/trac/boost/ticket/9041
+Patch75:        boost-1.54.0-thread-link_atomic.patch
 Recommends:     %{all_libs}
 
 %define _docdir %{_datadir}/doc/packages/boost-%{version}
@@ -432,6 +434,7 @@ find -type f ! \( -name \*.sh -o -name \*.py -o -name \*.pl \) -exec chmod -x {}
 %patch72 -p1
 %patch73 -p1
 %patch74 -p0
+%patch75 -p1
 #stupid build machinery copies .orig files
 find . -name \*.orig -exec rm {} +