diff --git a/cmake/LuaNativeObjects.cmake b/cmake/LuaNativeObjects.cmake
index d7a090a..560507b 100644
--- a/cmake/LuaNativeObjects.cmake
+++ b/cmake/LuaNativeObjects.cmake
@@ -2,7 +2,7 @@
 # Lua Native Objects
 #
 
-find_program(LUA_NATIVE_OBJECTS_EXECUTABLE native_objects.lua
+find_program(LUA_NATIVE_OBJECTS_EXECUTABLE native_objects
 	PATHS ${CMAKE_SOURCE_DIR}/../LuaNativeObjects
 	DOC "LuaNativeObjects executable path")
 set(USE_PRE_GENERATED_BINDINGS TRUE CACHE BOOL
diff --git a/git2.nobj.lua b/git2.nobj.lua
index 318c07b..3a202f9 100644
--- a/git2.nobj.lua
+++ b/git2.nobj.lua
@@ -85,12 +85,15 @@ subfiles {
 --
 -- Load parsed libgit2 docs.
 --
-local json = require"json"
 local file = io.open("docs/libgit2.json", "r")
-local libgit2_docs = json.decode(file:read("*a"))
+local text = file:read("*a")
 file:close()
-
-local lg_funcs = libgit2_docs.functions
+local ok, json = pcall(require, "json")
+local lg_funcs = {}
+if ok then
+	local libgit2_docs = json.decode(text)
+	lg_funcs = libgit2_docs.functions
+end
 
 -- Copy docs from libgit2
 reg_stage_parser("pre_gen",{