diff --git a/CMake/FindCurlCpp.cmake b/CMake/FindCurlCpp.cmake
new file mode 100644
index 0000000000000000000000000000000000000000..5f19279f892239769d3f503938dee70be879350b
--- /dev/null
+++ b/CMake/FindCurlCpp.cmake
@@ -0,0 +1,47 @@
+# - Try to find readline, a library for easy editing of command lines.
+# Variables used by this module:
+#  CURLCPP_ROOT_DIR     - CurlCpp root directory
+# Variables defined by this module:
+#  CURLCPP_FOUND        - system has CurlCpp
+#  CURLCPP_INCLUDE_DIR  - the CurlCpp include directory (cached)
+#  CURLCPP_INCLUDE_DIRS - the CurlCpp include directories
+#                          (identical to CURLCPP_INCLUDE_DIR)
+#  CURLCPP_LIBRARY      - the CurlCpp library (cached)
+#  CURLCPP_LIBRARIES    - the CurlCpp library
+
+# Copyright (C) 2009
+# ASTRON (Netherlands Institute for Radio Astronomy)
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+#
+# This file is part of the LOFAR software suite.
+# The LOFAR software suite is free software: you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# The LOFAR software suite is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
+#
+# $Id$
+
+if(NOT CURLCPP_FOUND)
+
+  find_path(CURLCPP_INCLUDE_DIR curlpp/cURLpp.hpp
+    HINTS ${CURLCPP_ROOT_DIR} PATH_SUFFIXES include)
+  find_library(CURLCPP_LIBRARY curlpp
+    HINTS ${CURLCPP_ROOT_DIR} PATH_SUFFIXES lib)
+  mark_as_advanced(CURLCPP_INCLUDE_DIR CURLCPP_LIBRARY)
+
+  include(FindPackageHandleStandardArgs)
+  find_package_handle_standard_args(curlcpp DEFAULT_MSG
+    CURLCPP_LIBRARY CURLCPP_INCLUDE_DIR)
+
+  set(CURLCPP_INCLUDE_DIRS ${CURLCPP_INCLUDE_DIR})
+  set(CURLCPP_LIBRARIES ${CURLCPP_LIBRARY})
+
+endif(NOT CURLCPP_FOUND)
diff --git a/MAC/APL/MainCU/src/MACScheduler/CMakeLists.txt b/MAC/APL/MainCU/src/MACScheduler/CMakeLists.txt
index f8cc29c6b5cc39197e6c2b858822b9c779c6ad81..9aa9a883fd01e9c743acf2ccd87ff6da49516370 100644
--- a/MAC/APL/MainCU/src/MACScheduler/CMakeLists.txt
+++ b/MAC/APL/MainCU/src/MACScheduler/CMakeLists.txt
@@ -1,6 +1,7 @@
 # $Id$
 
 lofar_find_package(JsonCpp)
+lofar_find_package(CurlCpp)
 
 lofar_add_bin_program(MACScheduler
   MACSchedulerMain.cc
@@ -20,4 +21,4 @@ install(FILES
   ${CMAKE_CURRENT_BINARY_DIR}/MACScheduler.conf
   DESTINATION etc)
 
-add_subdirectory(test)
+#add_subdirectory(test)
diff --git a/MAC/APL/MainCU/src/MACScheduler/test/CMakeLists.txt b/MAC/APL/MainCU/src/MACScheduler/test/CMakeLists.txt
index 13bb1b7ed071567b3c6adbc33973eeb6e1f8dfb3..1995a1a07438aff31ee895c38390d5a4fd80003a 100644
--- a/MAC/APL/MainCU/src/MACScheduler/test/CMakeLists.txt
+++ b/MAC/APL/MainCU/src/MACScheduler/test/CMakeLists.txt
@@ -1,7 +1,6 @@
 include(LofarCTest)
 
 lofar_find_package(UnitTest++)
-find_library(JSONCPP jsoncpp)
 
 if(UNITTEST++_FOUND)
     target_link_libraries(tTMSSBridge jsoncpp)