Index: head/lib/clang/include/lldb/Host/Config.h
===================================================================
--- head/lib/clang/include/lldb/Host/Config.h
+++ head/lib/clang/include/lldb/Host/Config.h
@@ -43,7 +43,7 @@
 
 #define LLDB_ENABLE_LIBXML2 0
 
-#define LLDB_ENABLE_LUA 0
+#define LLDB_ENABLE_LUA 1
 
 #define LLDB_ENABLE_PYTHON 0
 
Index: head/lib/clang/liblldb/Makefile
===================================================================
--- head/lib/clang/liblldb/Makefile
+++ head/lib/clang/liblldb/Makefile
@@ -13,6 +13,8 @@
 CFLAGS+=	-I${OBJTOP}/lib/clang/libllvm
 CFLAGS+=	-I${OBJTOP}/lib/clang/libclang
 CFLAGS+=	-I${OBJTOP}/lib/clang/liblldb
+CFLAGS+=	-I${SRCTOP}/contrib/lua/src
+CFLAGS+=	-I${SRCTOP}/lib/liblua
 
 SRCS+=		API/SBAddress.cpp
 SRCS+=		API/SBAttachInfo.cpp
@@ -462,6 +464,8 @@
 SRCS+=		Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
 SRCS+=		Plugins/Process/gdb-remote/ProcessGDBRemoteLog.cpp
 SRCS+=		Plugins/Process/gdb-remote/ThreadGDBRemote.cpp
+SRCS+=		Plugins/ScriptInterpreter/Lua/Lua.cpp
+SRCS+=		Plugins/ScriptInterpreter/Lua/ScriptInterpreterLua.cpp
 SRCS+=		Plugins/ScriptInterpreter/None/ScriptInterpreterNone.cpp
 SRCS+=		Plugins/SymbolFile/Breakpad/SymbolFileBreakpad.cpp
 SRCS+=		Plugins/SymbolFile/DWARF/AppleDWARFIndex.cpp
@@ -642,6 +646,7 @@
 SRCS+=		Utility/UserIDResolver.cpp
 SRCS+=		Utility/VASprintf.cpp
 SRCS+=		Utility/VMRange.cpp
+SRCS+=		LLDBWrapLua.cpp
 SRCS+=		lldb.cpp
 
 LLDB_TBLGEN?=	lldb-tblgen
Index: head/usr.bin/clang/lldb/Makefile
===================================================================
--- head/usr.bin/clang/lldb/Makefile
+++ head/usr.bin/clang/lldb/Makefile
@@ -36,6 +36,7 @@
 
 LIBADD+=	edit
 LIBADD+=	execinfo
+LIBADD+=	lua
 LIBADD+=	lzma
 LIBADD+=	ncursesw
 LIBADD+=	panel