diff --git a/interpreter/cling/tools/Jupyter/CMakeLists.txt b/interpreter/cling/tools/Jupyter/CMakeLists.txt
index c9d743bad255edca0396e923a10177d60f206ed9..7db7ae5466daace323be156b298e359a58e9f69f 100644
--- a/interpreter/cling/tools/Jupyter/CMakeLists.txt
+++ b/interpreter/cling/tools/Jupyter/CMakeLists.txt
@@ -6,16 +6,28 @@
 # LICENSE.TXT for details.
 #------------------------------------------------------------------------------
 
+# Keep symbols for JIT resolution
+set(LLVM_NO_DEAD_STRIP 1)
+
 set(SOURCES
     Kernel.cpp
     )
 
 set(LIBS
-    clangBasic
-    clangAST
-    clangFrontend
-    clingInterpreter
-    clingUtils
+        clangAST
+        clangBasic
+        clangCodeGen
+        clangDriver
+        clangFrontend
+        clangLex
+        clangParse
+        clangSema
+        clangSerialization
+
+        clingUserInterface
+        clingMetaProcessor
+        clingInterpreter
+        clingUtils
     )
 
 if( LLVM_ENABLE_PIC )
@@ -28,10 +40,9 @@ else()
     set(output_name "clingJupyter")
 endif()
 
-add_clang_library(libclingJupyter ${ENABLE_SHARED} ${ENABLE_STATIC}
+add_cling_library(libclingJupyter ${ENABLE_SHARED} ${ENABLE_STATIC}
         OUTPUT_NAME ${output_name}
         ${SOURCES}
-#        DEPENDS clang-headers
 
         LINK_LIBS
         ${LIBS}
@@ -41,6 +52,9 @@ add_clang_library(libclingJupyter ${ENABLE_SHARED} ${ENABLE_STATIC}
         Support
         )
 
+set_target_properties(libclingJupyter
+        PROPERTIES ENABLE_EXPORTS 1)
+
 if(ENABLE_SHARED)
     if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
         set(LIBCLINGJUPYTER_LINK_FLAGS " -Wl,-compatibility_version -Wl,1")