diff --git a/share/builtin.lua b/share/builtin/builtin.lua
similarity index 100%
rename from share/builtin.lua
rename to share/builtin/builtin.lua
diff --git a/src/server.cpp b/src/server.cpp
index 1060426b3..b95d04713 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -890,7 +890,8 @@ Server::Server(
 		infostream<<"- addons: "<<(*i)<<std::endl;
 
 	// Path to builtin.lua
-	std::string builtinpath = porting::path_share + DIR_DELIM + "builtin.lua";
+	std::string builtinpath = porting::path_share + DIR_DELIM + "builtin"
+			+ DIR_DELIM + "builtin.lua";
 
 	// Add default global mod search path
 	m_modspaths.push_front(m_gamespec.path + DIR_DELIM "mods");