diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale
index a56632c3f..ef6bbfb99 100644
--- a/data/locale/deutsch.locale
+++ b/data/locale/deutsch.locale
@@ -789,6 +789,7 @@ imageinfo.homepage Homepage:
 imageinfo.image Image:
 imageinfo.kernel Kernel:
 imageinfo.license Lizenz
+imageinfo.lua LUA-API:
 imageinfo.vcs Git:
 imageinfo.version Version:
 inetradio.name Internetradio
diff --git a/data/locale/english.locale b/data/locale/english.locale
index 32d397b37..4b11dcf6f 100644
--- a/data/locale/english.locale
+++ b/data/locale/english.locale
@@ -789,6 +789,7 @@ imageinfo.homepage Home page:
 imageinfo.image Image:
 imageinfo.kernel Kernel:
 imageinfo.license License
+imageinfo.lua LUA-API:
 imageinfo.vcs Git:
 imageinfo.version Version:
 inetradio.name Internetradio
diff --git a/data/locale/nederlands.locale b/data/locale/nederlands.locale
index 68dbea5bc..58960ab60 100644
--- a/data/locale/nederlands.locale
+++ b/data/locale/nederlands.locale
@@ -734,6 +734,7 @@ imageinfo.homepage Website:
 imageinfo.image Image:
 imageinfo.kernel Kernel:
 imageinfo.license Licentie
+imageinfo.lua LUA-API:
 imageinfo.vcs Git:
 imageinfo.version Versie:
 inetradio.name Internetradio
diff --git a/data/locale/slovak.locale b/data/locale/slovak.locale
index a4138edb1..1faf8c62b 100644
--- a/data/locale/slovak.locale
+++ b/data/locale/slovak.locale
@@ -784,6 +784,7 @@ imageinfo.homepage Adresa:
 imageinfo.image Image:
 imageinfo.kernel Jadro:
 imageinfo.license Licencia:
+imageinfo.lua LUA-API:
 imageinfo.vcs Git:
 imageinfo.version Verzia:
 inetradio.name Internetové rádio
diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp
index db641841e..12e74be70 100644
--- a/src/gui/movieplayer.cpp
+++ b/src/gui/movieplayer.cpp
@@ -753,11 +753,11 @@ bool CMoviePlayerGui::luaGetUrl(const std::string &script, const std::string &fi
 
 	std::vector<std::string> args;
 	args.push_back(file);
-
+#ifdef ENABLE_LUA
 	CLuaInstance *lua = new CLuaInstance();
 	lua->runScript(script.c_str(), &args, &result_code, &result_string);
 	delete lua;
-
+#endif
 	if ((result_code != "0") || result_string.empty()) {
 		if (box != NULL) {
 			box->hide();
@@ -2157,7 +2157,9 @@ void CMoviePlayerGui::handleMovieBrowser(neutrino_msg_t msg, int /*position*/)
 					yres = 1080;
 				aspectRatio = videoDecoder->getAspectRatio();
 			}
+#ifdef ENABLE_LUA
 			CLuaInstVideo::getInstance()->execLuaInfoFunc(luaState, xres, yres, aspectRatio, framerate);
+#endif
 		}
 		else if (p_movie_info)
 			g_EpgData->show_mp(p_movie_info, position, duration);
diff --git a/src/gui/plugins.cpp b/src/gui/plugins.cpp
index fd86c8e99..1a8bb2fee 100644
--- a/src/gui/plugins.cpp
+++ b/src/gui/plugins.cpp
@@ -427,9 +427,11 @@ void CPlugins::startLuaPlugin(int number)
 		       script, plugin_list[number].cfgfile.c_str());
 		return;
 	}
+#ifdef ENABLE_LUA
 	CLuaInstance *lua = new CLuaInstance();
 	lua->runScript(script);
 	delete lua;
+#endif
 #if HAVE_SPARK_HARDWARE
 	frameBuffer->ClearFB();
 #endif
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 31dc68ce0..4b85e0928 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -140,9 +140,9 @@
 #include <lib/libdvbsub/dvbsub.h>
 #include <lib/libtuxtxt/teletext.h>
 #include <eitd/sectionsd.h>
-
+#ifdef ENABLE_LUA
 #include <system/luaserver.h>
-
+#endif
 int old_b_id = -1;
 
 CInfoClock      *InfoClock;
@@ -2288,9 +2288,9 @@ void CNeutrinoApp::RealRun()
 		standbyMode(true, true);
 
 	//cCA::GetInstance()->Ready(true);
-
+#ifdef ENABLE_LUA
 	CLuaServer *luaServer = CLuaServer::getInstance();
-
+#endif
 	g_PluginList->startPlugin("startup");
 	if (!g_PluginList->getScriptOutput().empty()) {
 		ShowMsg(LOCALE_PLUGINS_RESULT, g_PluginList->getScriptOutput(), CMessageBox::mbrBack,CMessageBox::mbBack,NEUTRINO_ICON_SHELL);
@@ -2301,10 +2301,14 @@ void CNeutrinoApp::RealRun()
 	m_screensaver	= false;
 
 	while( true ) {
+#ifdef ENABLE_LUA
 		luaServer->UnBlock();
+#endif
 		g_RCInput->getMsg(&msg, &data, 100, ((g_settings.mode_left_right_key_tv == SNeutrinoSettings::VOLUME) && (g_RemoteControl->subChannels.size() < 1)) ? true : false);	// 10 secs..
+#ifdef ENABLE_LUA
 		if (luaServer->Block(msg, data))
 			continue;
+#endif
 
 		if (mode == mode_radio) {
 			bool ignored_msg = (
diff --git a/src/system/locals.h b/src/system/locals.h
index 54ceee3fb..1a132b51a 100644
--- a/src/system/locals.h
+++ b/src/system/locals.h
@@ -816,6 +816,7 @@ typedef enum
 	LOCALE_IMAGEINFO_IMAGE,
 	LOCALE_IMAGEINFO_KERNEL,
 	LOCALE_IMAGEINFO_LICENSE,
+	LOCALE_IMAGEINFO_LUA,
 	LOCALE_IMAGEINFO_VCS,
 	LOCALE_IMAGEINFO_VERSION,
 	LOCALE_INETRADIO_NAME,
diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h
index 7c5c6e304..1e6ca26e5 100644
--- a/src/system/locals_intern.h
+++ b/src/system/locals_intern.h
@@ -816,6 +816,7 @@ const char * locale_real_names[] =
 	"imageinfo.image",
 	"imageinfo.kernel",
 	"imageinfo.license",
+	"imageinfo.lua",
 	"imageinfo.vcs",
 	"imageinfo.version",
 	"inetradio.name",