diff --git a/configure.ac b/configure.ac
index 68f069c13..31a9f1ce3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -116,19 +116,6 @@ if test "$BOXTYPE" = "coolstream"; then
 	TUXBOX_APPS_LIB_PKGCONFIG(BLURAY,libbluray)
 fi
 
-# either use dynamic lualib in package lua (openSUSE)
-# ... or in package lua5.2 (debian-derivates)
-# ... and if all fails, assume it is in the linker path (cross build)
-PKG_CHECK_MODULES([LUA], [lua >= 5.2], echo "lua >= 5.2 found", [
-	PKG_CHECK_MODULES([LUA], [lua5.2 >= 5.2], echo "lua5.2 found", [
-		echo "=> lualib not found, assuming static lua in linker path..."
-		LUA_LIBS="-llua -ldl"
-		AC_DEFINE(STATIC_LUAPOSIX,1,[Define to 1 for static lua build.])
-	])
-])
-# hack...
-AC_DEFINE(LUA_COMPAT_5_2,1,[does not really belong in config.h, but is needed for build with lua 5.3+])
-
 if test "$BOXTYPE" = "coolstream" ||
    test "$BOXTYPE" = "tripledragon" ||
    test "$BOXTYPE" = "spark"; then
@@ -236,8 +223,8 @@ fi
 
 # Lua - embeddable scripting language
 AC_ARG_ENABLE(lua,
-	AS_HELP_STRING(--enable-lua,include Lua support),
-	,[enable_lua=no])
+	AS_HELP_STRING(--disable-lua,disable Lua support),
+	,[enable_lua=yes])
 
 AM_CONDITIONAL(ENABLE_LUA,test "$enable_lua" = "yes")
 if test "$enable_lua" = "yes"; then
diff --git a/src/Makefile.am b/src/Makefile.am
index 827b10b7d..3bc91c85c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -69,10 +69,10 @@ MTDUTILSLIBS = \
 	system/mtdutils/lib/libneutrino_system_mtdutils_lib.a
 endif
 
-#if ENABLE_LUA
+if ENABLE_LUA
 LUALIBS = \
 	gui/lua/libneutrino_gui_lua.a
-#endif
+endif
 
 neutrino_LDADD = \
 	daemonc/libneutrino_daemonc.a \
@@ -133,7 +133,9 @@ neutrino_LDADD += -lgif
 else
 neutrino_LDADD += -lungif
 endif
+if ENABLE_LUA
 neutrino_LDADD += @LUA_LIBS@
+endif
 
 if ENABLE_UPNP
 neutrino_LDADD += \
diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am
index d9dcc780f..87c5c403a 100644
--- a/src/gui/Makefile.am
+++ b/src/gui/Makefile.am
@@ -16,9 +16,9 @@ noinst_HEADERS = version.h
 
 SUBDIRS = bedit components widget
 
-#if ENABLE_LUA
+if ENABLE_LUA
 SUBDIRS += lua
-#endif
+endif
 
 AM_CPPFLAGS += \
 	-I$(top_builddir) \