diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0e30ba2a9a0365481a9b81ee578f86d4ea9ccd0d..cb2e676294179599e5a3f382b85c47d04d2cdf1f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1004,6 +1004,3 @@ message("")
 
 mark_as_advanced(BISON FLEX GMP_LIB GMSH_EXTRA_VERSION HDF5_LIB MAKEINFO 
                  MED_LIB OCC_INC SZ_LIB TAUCS_LIB LUA_LIB TEXI2PDF)
-
-add_executable(gmshlua EXCLUDE_FROM_ALL Solver/dgMainLua.cpp ${GMSH_SRC})
-target_link_libraries(gmshlua ${LINK_LIBRARIES})
diff --git a/Common/CMakeLists.txt b/Common/CMakeLists.txt
index b1db0dabb6f9d51909b585b55fc9c83aeb2485cc..f1eda826c322436a5e382556133f570599b2480b 100644
--- a/Common/CMakeLists.txt
+++ b/Common/CMakeLists.txt
@@ -13,6 +13,7 @@ set(SRC
   OS.cpp
   OpenFile.cpp
   CreateFile.cpp
+  LuaBindings.cpp
   VertexArray.cpp
   SmoothData.cpp
   Octree.cpp 
diff --git a/Common/OpenFile.cpp b/Common/OpenFile.cpp
index 2e92767d268bb690304a82195b95a76c0cd32899..4f7b19aa25a50f10fcef345ac0b8aea4985ea87c 100644
--- a/Common/OpenFile.cpp
+++ b/Common/OpenFile.cpp
@@ -17,6 +17,7 @@
 #include "OS.h"
 #include "StringUtils.h"
 #include "GeomMeshMatcher.h"
+#include "LuaBindings.h"
 
 #if defined(HAVE_PARSER)
 #include "Parser.h"
@@ -328,6 +329,11 @@ int MergeFile(std::string fileName, bool warnIfMissing)
     status = read_png(fileName);
   }
 #endif
+#endif
+#if defined(HAVE_LUA)
+  else if(ext == ".lua" || ext == ".LUA") {
+    status = read_lua(fileName.c_str());
+  }
 #endif
   else {
     CTX::instance()->geom.draw = 1;