diff --git a/CMakeLists.txt b/CMakeLists.txt
index f0c105964..5c0b987d1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -866,6 +866,10 @@ if(ENABLE_EXTRA)
 	list(APPEND SRC ${EXTRA_SRC})
 endif()
 
+if(ENABLE_SCRIPTING)
+	list(APPEND SRC ${CORE_SCRIPT_SRC})
+endif()
+
 if(NOT SKIP_LIBRARY)
 	if(NOT BUILD_STATIC AND NOT BUILD_SHARED)
 		set(BUILD_SHARED ON)
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index bd1f3ecf8..184445023 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -24,7 +24,7 @@ set(TEST_FILES
 	test/core.c)
 
 if(ENABLE_SCRIPTING)
-	list(APPEND SOURCE_FILES
+	set(SCRIPTING_FILES
 		scripting.c)
 
 	if(USE_LUA)
@@ -34,7 +34,9 @@ if(ENABLE_SCRIPTING)
 endif()
 
 source_group("mCore" FILES ${SOURCE_FILES})
+source_group("mCore scripting" FILES ${SCRIPTING_FILES})
 source_group("mCore tests" FILES ${TEST_FILES})
 
 export_directory(CORE SOURCE_FILES)
+export_directory(CORE_SCRIPT SCRIPTING_FILES)
 export_directory(CORE_TEST TEST_FILES)