diff --git a/Event/ByteStreamStoragePlugins/CMakeLists.txt b/Event/ByteStreamStoragePlugins/CMakeLists.txt
index 3f13735079ed2821a91f4216d0bc399539c35af6..0773990325887ff685c4c64b4945affb8005238b 100644
--- a/Event/ByteStreamStoragePlugins/CMakeLists.txt
+++ b/Event/ByteStreamStoragePlugins/CMakeLists.txt
@@ -1,4 +1,4 @@
-# $Id: CMakeLists.txt 730743 2016-03-17 15:28:57Z krasznaa $
+# $Id: CMakeLists.txt 756879 2016-06-22 12:09:32Z krasznaa $
 ################################################################################
 # Package: ByteStreamStoragePlugins
 ################################################################################
@@ -7,15 +7,14 @@
 atlas_subdir( ByteStreamStoragePlugins )
 
 # External dependencies:
-find_package( Boost )
+find_package( Boost COMPONENTS system )
 find_package( CASTOR COMPONENTS rfio )
-find_package( Xrootd COMPONENTS PosixPreload )
+find_package( Xrootd COMPONENTS Posix PosixPreload )
 find_package( dcache_client )
 find_package( tdaq-common COMPONENTS ers )
 
 # Make sure that libraries are linked correctly:
-string( REPLACE "-Wl,--as-needed" "" CMAKE_SHARED_LINKER_FLAGS
-   "${CMAKE_SHARED_LINKER_FLAGS}" )
+atlas_disable_as_needed()
 
 # Component(s) in the package:
 atlas_add_library( fReadCastor
diff --git a/Event/ByteStreamStoragePlugins/cmt/requirements b/Event/ByteStreamStoragePlugins/cmt/requirements
index 0c7e2869f1ed3ad942211ff877502e7315cc0b66..a9cc94b9ac4c751ebfd7ae10e79d287ae6b7c16e 100644
--- a/Event/ByteStreamStoragePlugins/cmt/requirements
+++ b/Event/ByteStreamStoragePlugins/cmt/requirements
@@ -72,3 +72,4 @@ use AtlasDCACHE AtlasDCACHE-* External -no_auto_imports
 #apply_tag $(use_GFAL)
 #use AtlasGFAL  AtlasGFAL-*  External -no_auto_imports
 ##
+