diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3c690878ca9463a394a936ca62e245fe16f0a8a4..cfb5752eda6884bbe0f958160227e7cbecb82c0e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -77,6 +77,8 @@ option ( WALBERLA_BUILD_WITH_LTO            "Enable link time optimizations"
 option ( WALBERLA_BUILD_WITH_OPENMP         "Enable OpenMP support"                              )  
 option ( WALBERLA_BUILD_WITH_PYTHON         "Support for embedding Python"                       ) 
 option ( WALBERLA_BUILD_WITH_PYTHON_MODULE  "Build waLBerla python module"                       )
+option ( WALBERLA_BUILD_WITH_PYTHON_LBM     "Include LBM module into python module"          OFF )
+
 option ( WALBERLA_BUILD_WITH_LIKWID_MARKERS "Compile in markers for likwid-perfctr"              )
 
 
diff --git a/apps/pythonmodule/CMakeLists.txt b/apps/pythonmodule/CMakeLists.txt
index 0893abaa03a90f7aa3c5a8a5f8252ae5278eb367..b52d000daa3f0986e2121a073a21025302f08f11 100644
--- a/apps/pythonmodule/CMakeLists.txt
+++ b/apps/pythonmodule/CMakeLists.txt
@@ -11,9 +11,11 @@ if ( WALBERLA_BUILD_WITH_PYTHON_MODULE )
        set ( pythonModules "-Wl,-whole-archive" blockforest boundary domain_decomposition core field geometry lbm postprocessing python_coupling timeloop vtk  "-Wl,-no-whole-archive" )
     endif()
 
-
-    #add_library( walberla_cpp SHARED PythonModuleWithLbmModule.cpp )
-    add_library( walberla_cpp SHARED PythonModule.cpp )
+    if( WALBERLA_BUILD_WITH_PYTHON_LBM )
+        add_library( walberla_cpp SHARED PythonModuleWithLbmModule.cpp )
+    else()
+        add_library( walberla_cpp SHARED PythonModule.cpp )
+    endif()
 
     target_link_libraries( walberla_cpp ${pythonModules} ${SERVICE_LIBS}  )
     set_target_properties( walberla_cpp PROPERTIES PREFIX "")
diff --git a/apps/pythonmodule/PythonModuleWithLbmModule.cpp b/apps/pythonmodule/PythonModuleWithLbmModule.cpp
index d749c9e19cdbbcc5288ba821ff1662f74ad06b3e..03301a7233b59228c4f58758738baf62e5454148 100644
--- a/apps/pythonmodule/PythonModuleWithLbmModule.cpp
+++ b/apps/pythonmodule/PythonModuleWithLbmModule.cpp
@@ -21,10 +21,11 @@
 #include "waLBerlaDefinitions.h"
 #include "blockforest/python/Exports.h"
 #include "field/GhostLayerField.h"
+#include "field/python/Exports.h"
 #include "geometry/python/Exports.h"
 #include "lbm/all.h"
 #include "lbm/lattice_model/ForceModel.h"
-#include "lbm/python/ExportBasic.h"
+#include "lbm/python/Exports.h"
 #include "postprocessing/python/Exports.h"
 #include "python_coupling/Manager.h"
 #include "python_coupling/helper/ModuleInit.h"
diff --git a/python/waLBerla_docs/modules/lbm.rst b/python/waLBerla_docs/modules/lbm.rst
index 48b4bf7ca0968f8c62b60a7cc638a007ffb7cb4e..519462ef247cde66a7c4c0613b96d7d27446cf05 100644
--- a/python/waLBerla_docs/modules/lbm.rst
+++ b/python/waLBerla_docs/modules/lbm.rst
@@ -2,6 +2,8 @@
 LBM module
 **********
 
+.. note:: This module is deprecated and about to be replaced by the native Python module *lbmpy*
+
 
 Creation Functions
 ==================