diff --git a/CMakeLists.txt b/CMakeLists.txt
index d5d958bca..20dc51682 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -211,6 +211,7 @@ install(DIRECTORY cmake DESTINATION share/opm)
 install(FILES etc/opm_bash_completion.sh.in DESTINATION share/opm/etc)
 
 if (ENABLE_PYTHON)
+  add_subdirectory(python)
 endif()
 
 
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index 6580c8107..540a909c4 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -1,10 +1,4 @@
-cmake_minimum_required( VERSION 2.8 )
-project( SUNBEAM )
-enable_language( CXX )
-include( CheckCXXSourceCompiles )
-include( CTest )
 
-find_package(opm-common REQUIRED)
 find_package(PythonInterp REQUIRED)
 
 set( warnings "-Wall -Wextra -pedantic -Wpointer-arith" )
@@ -15,7 +9,7 @@ set( warnings "${warnings} -Wredundant-decls" )
 set( CMAKE_CXX_FLAGS "-std=c++11 ${warnings} ${CMAKE_CXX_FLAGS}" )
 
 
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/pycmake)
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/python/pycmake)
 
 option( USE_RPATH "Embed RPATH in libraries and binaries" OFF)
 if (USE_RPATH)
diff --git a/python/sunbeam/CMakeLists.txt b/python/sunbeam/CMakeLists.txt
index b8e342eca..3d519f955 100644
--- a/python/sunbeam/CMakeLists.txt
+++ b/python/sunbeam/CMakeLists.txt
@@ -15,7 +15,6 @@ pybind11_add_module(libsunbeam sunbeam.cpp
                                parser.cpp)
 
 set_target_properties( libsunbeam PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/python/sunbeam )
-include_directories( ${opm-common_INCLUDE_DIRS} )
 
 # The cmake config files generated by opm-common are generated in a non standard
 # way and they are not fully relocatable. This creates problems when we are
@@ -44,8 +43,8 @@ if (DEST_PREFIX)
   find_package(Boost REQUIRED COMPONENTS filesystem regex)
   target_link_libraries(libsunbeam PRIVATE ecl)
   target_link_libraries(libsunbeam PRIVATE ${Boost_LIBRARIES})
-  target_link_libraries(libsunbeam PRIVATE ${opm-common_LIBRARY})
+  target_link_libraries(libsunbeam PRIVATE opmcommon)
 else()
-  target_link_libraries( libsunbeam PRIVATE ${opm-common_LIBRARIES} )
+  target_link_libraries( libsunbeam PRIVATE opmcommon )
 endif()
 install(TARGETS libsunbeam DESTINATION ${PYTHON_INSTALL_PREFIX}/sunbeam)