diff --git a/cmake/Modules/FindLuaJIT.cmake b/cmake/Modules/FindLuaJIT.cmake
index 97b0b7c64..f4c52c269 100644
--- a/cmake/Modules/FindLuaJIT.cmake
+++ b/cmake/Modules/FindLuaJIT.cmake
@@ -9,7 +9,7 @@
 FIND_PATH(LUA_INCLUDE_DIR luajit.h
 	HINTS
 	$ENV{LUA_DIR}
-	PATH_SUFFIXES include/luajit-2.1 include/luajit-2.0 include/luajit-5_1-2.1 include/luajit-5_1-2.0 include luajit
+	PATH_SUFFIXES include/luajit-2.1 include/luajit-2.0 include/luajit-5_1-2.1 include/luajit-5_1-2.0 include/moonjit-2.2 include luajit
 	PATHS
 	~/Library/Frameworks
 	/Library/Frameworks
diff --git a/doc/minetest.6 b/doc/minetest.6
index bac70fe1a..1b6f6a71f 100644
--- a/doc/minetest.6
+++ b/doc/minetest.6
@@ -1,21 +1,21 @@
-.TH minetest 6 "2 February 2019" "" ""
+.TH multicraft 6 "2 February 2019" "" ""
 
 .SH NAME
-minetest, minetestserver \- Multiplayer infinite-world block sandbox
+multicraft, multicraftserver \- Multiplayer infinite-world block sandbox
 
 .SH SYNOPSIS
-.B minetest
+.B multicraft
 [\fB--server SERVER OPTIONS\fR | \fBCLIENT OPTIONS\fR]
 [\fBCOMMON OPTIONS\fR]
 [\fBWORLD PATH\fR]
 
-.B minetestserver
+.B multicraftserver
 [\fBSERVER OPTIONS\fR]
 [\fBCOMMON OPTIONS\fR]
 [\fBWORLD PATH\fR]
 
 .SH DESCRIPTION
-.B Minetest is one of the first InfiniMiner/Minecraft(/whatever) inspired games
+.B Multicraft is forked from minetest, a InfiniMiner/Minecraft(/whatever) inspired game
 (started October 2010), with a goal of taking the survival multiplayer gameplay
 in a slightly different direction.
 .PP
@@ -121,7 +121,7 @@ Display an interactive terminal over ncurses during execution.
 Colon delimited list of directories to search for games.
 
 .SH BUGS
-Please report all bugs at https://github.com/minetest/minetest/issues.
+Please report all bugs at https://github.com/multicraft/multicraft/issues.
 
 .SH AUTHOR
 .PP
@@ -131,4 +131,4 @@ This man page was originally written by
 Juhani Numminen <juhaninumminen0@gmail.com>.
 
 .SH WWW
-http://www.minetest.net/
+http://www.multicraft.world/
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1be05a8be..4ce3b7168 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -179,7 +179,7 @@ if(ENABLE_POSTGRESQL)
 			set(PostgreSQL_LIBRARIES ${PostgreSQL_LIBRARY})
 		endif()
 	else()
-		find_package(PostgreSQL)
+		find_package("PostgreSQL")
 	endif()
 
 	if(PostgreSQL_FOUND)
@@ -189,7 +189,8 @@ if(ENABLE_POSTGRESQL)
 		message(STATUS "PostgreSQL includes: ${PostgreSQL_INCLUDE_DIRS}")
 		include_directories(${PostgreSQL_INCLUDE_DIRS})
 	else()
-		message(STATUS "PostgreSQL not found!")
+		message(STATUS "PostgreSQL not found (maybe older or no cmake module)! disable, path is to /usr/include/postgresql/")
+		set(PostgreSQL_TYPE_INCLUDE_DIR /usr/include/postgresql/)
 	endif()
 endif(ENABLE_POSTGRESQL)
 
@@ -878,7 +879,7 @@ else()
 		endif()
 	endif()
 
-	set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${WARNING_FLAGS} ${OTHER_FLAGS} -Wall -pipe -funroll-loops")
+	set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${WARNING_FLAGS} ${CMAKE_C_FLAGS_RELEASE} ${CMAKE_CXX_FLAGS} $ENV{CFLAGS} -Wall -pipe -funroll-loops")
 	if(CMAKE_SYSTEM_NAME MATCHES "(Darwin|BSD|DragonFly)")
 		set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Os")
 	else()
@@ -891,13 +892,12 @@ else()
 			set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${MATH_FLAGS}")
 		endif()
 	endif(CMAKE_SYSTEM_NAME MATCHES "(Darwin|BSD|DragonFly)")
-	set(CMAKE_CXX_FLAGS_RELEASE     "${CMAKE_CXX_FLAGS_RELEASE} ${CMAKE_CXX_FLAGS} $ENV{CPPFLAGS}")
-	set(CMAKE_CXX_FLAGS_SEMIDEBUG "-g -O1 -Wall ${WARNING_FLAGS} ${OTHER_FLAGS} $ENV{CPPFLAGS}")
-	set(CMAKE_CXX_FLAGS_DEBUG "-g -O0 -Wall ${WARNING_FLAGS} ${OTHER_FLAGS}")
-	set(CMAKE_C_FLAGS_RELEASE        "${CMAKE_C_FLAGS_RELEASE} ${CMAKE_C_FLAGS} $ENV{CFLAGS} ")
+
+	set(CMAKE_CXX_FLAGS_SEMIDEBUG "-g -O1 -Wall ${WARNING_FLAGS} ${CMAKE_CXX_FLAGS} ${OTHER_FLAGS} $ENV{CPPFLAGS}")
+	set(CMAKE_CXX_FLAGS_DEBUG "-g -O0 -Wall ${WARNING_FLAGS} ${CMAKE_CXX_FLAGS} ${OTHER_FLAGS} $ENV{CPPFLAGS}")
 	set(CMAKE_C_FLAGS_DEBUG          "${CMAKE_C_FLAGS_DEBUG}   ${CMAKE_C_FLAGS} -g")
 	set(CMAKE_C_FLAGS_PROFILE        "${CMAKE_C_FLAGS_PROFILE} ${CMAKE_C_FLAGS} -O1 -g")
-	set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_WITHDEBINFO} ${CMAKE_C_FLAGS}  $ENV{CFLAGS} -g")
+	set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_WITHDEBINFO} ${CMAKE_C_FLAGS} $ENV{CFLAGS} -g")
 
 	if(USE_GPROF)
 		set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -pg")