diff --git a/cmake/ConkyPlatformChecks.cmake b/cmake/ConkyPlatformChecks.cmake
index e2db6111..123a9f3a 100644
--- a/cmake/ConkyPlatformChecks.cmake
+++ b/cmake/ConkyPlatformChecks.cmake
@@ -291,6 +291,9 @@ if(WANT_TOLUA)
 		message(FATAL_ERROR "Unable to find tolua++ library")
 	endif(TOLUA_INCLUDE_PATH AND TOLUA_LIBS)
 	mark_as_advanced(APP_TOLUA TOLUA_INCLUDE_PATH TOLUA_LIBS)
+	set(conky_includes ${conky_includes} ${TOLUA_INCLUDE_PATH})
+	set(conky_libs ${conky_libs} ${TOLUA_LIBS})
+	set(LUA_EXTRAS true)
 endif(WANT_TOLUA)
 
 # Look for doc generation programs
diff --git a/cmake/config.h.in b/cmake/config.h.in
index e872f82f..2a32b0c0 100644
--- a/cmake/config.h.in
+++ b/cmake/config.h.in
@@ -157,4 +157,6 @@
 
 #cmakedefine HAVE_ICONV 1
 
+#cmakedefine LUA_EXTRAS 1
+
 #endif /* _conky_config_h_ */
diff --git a/lua/CMakeLists.txt b/lua/CMakeLists.txt
index fda262c3..bde5a679 100644
--- a/lua/CMakeLists.txt
+++ b/lua/CMakeLists.txt
@@ -22,6 +22,12 @@
 
 include(ToLua)
 
+add_definitions(-DTOLUA_RELEASE)
+set(CMAKE_C_FLAGS "-O3")
+set(CMAKE_C_FLAGS_DEBUG "-ggdb")
+set(CMAKE_CXX_FLAGS "-O3")
+set(CMAKE_CXX_FLAGS_DEBUG "-ggdb")
+
 if(BUILD_LUA_CAIRO)
 	include_directories(${luacairo_includes} ${CMAKE_CURRENT_SOURCE_DIR})
 	wrap_tolua(luacairo_src cairo.pkg)
diff --git a/src/audacious.h b/src/audacious.h
index 8fea119f..4e4047f2 100644
--- a/src/audacious.h
+++ b/src/audacious.h
@@ -44,7 +44,7 @@ enum _audacious_items {
 	AUDACIOUS_FILENAME,
 	AUDACIOUS_PLAYLIST_LENGTH,
 	AUDACIOUS_PLAYLIST_POSITION,
-	AUDACIOUS_MAIN_VOLUME,
+	AUDACIOUS_MAIN_VOLUME
 };
 
 /* 12 slots for the audacious values */
diff --git a/src/llua.c b/src/llua.c
index 8ec41dbf..c4b6c3cd 100644
--- a/src/llua.c
+++ b/src/llua.c
@@ -22,6 +22,7 @@
  *
  */
 
+#include <config.h>
 #include "conky.h"
 #include "llua.h"
 #include "logging.h"