diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1b17823566d5f878c2549dce761ed8d9233480c0..0c63df723e6d11e5845b6407bbb13483fee6c4e4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,6 +72,14 @@ endif (NOT DEFINED SKIP_UNIT_TESTS)
 #Load version information in all cases.
 include(cmake/CTAVersions.cmake)
 
+if (DEFINED NoACS)
+  message (STATUS "Running CMake without support for ACS")
+  set (use_manually_specified_variable ${NoACS})
+else (DEFINED NoACS)
+  message (STATUS "Running CMake with support for ACS")
+  message (STATUS "Override with -DNoACS:Bool=true")
+endif (DEFINED NoACS)
+
 IF(DEFINED PackageOnly)
   message (STATUS "Running CMake in package-only mode")
    set(COMPILE_PACKAGING "1") 
diff --git a/mediachanger/CMakeLists.txt b/mediachanger/CMakeLists.txt
index f5f23d67918edabb458d06d250fd055a93066b36..4f464de54e0fb17ea150e153dba1b48a215ccc30 100644
--- a/mediachanger/CMakeLists.txt
+++ b/mediachanger/CMakeLists.txt
@@ -15,7 +15,10 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 cmake_minimum_required (VERSION 2.6)
 
-add_subdirectory(acs)
+if (NOT DEFINED NoACS)
+  add_subdirectory(acs)
+endif (NOT DEFINED NoACS)
+
 add_subdirectory(reactor)
 add_subdirectory(castorrmc)
 find_package(openssl REQUIRED)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index a93a5ec30fe30418fb6d6f1a942071cd14b56189..10703a663c10be52263767db2910df7fcaa1ed43 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -40,11 +40,15 @@ target_link_libraries(cta-unitTests
   ctaschedulerunittests
   ctadaemonunittests
   ctamediachangerunittests
-  ctamediachangeracsdaemonunittests
-  ctamediachangeracsunittests
   gtest
   pthread)
 
+if (NOT DEFINED NoACS)
+  target_link_libraries(cta-unitTests
+    ctamediachangeracsdaemonunittests
+    ctamediachangeracsunittests)
+endif (NOT DEFINED NoACS)
+
 set_property (TARGET cta-unitTests APPEND PROPERTY INSTALL_RPATH ${PROTOBUF3_RPATH})
 if (OCCI_SUPPORT)
   set_property (TARGET cta-unitTests APPEND PROPERTY INSTALL_RPATH ${ORACLE-INSTANTCLIENT_RPATH})