diff --git a/src/main.cpp b/src/main.cpp
index 322d84e9e..46fe4715d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1222,11 +1222,14 @@ int main(int argc, char *argv[])
 		core::array<std::string> filenames;
 		filenames.push_back(porting::path_user +
 				DIR_DELIM + "minetest.conf");
+		// Legacy configuration file location
+		filenames.push_back(porting::path_user +
+				DIR_DELIM + ".." + DIR_DELIM + "minetest.conf");
 #ifdef RUN_IN_PLACE
 		// Try also from a lower level (to aid having the same configuration
 		// for many RUN_IN_PLACE installs)
 		filenames.push_back(porting::path_user +
-				DIR_DELIM + ".." + DIR_DELIM + "minetest.conf");
+				DIR_DELIM + ".." + DIR_DELIM + ".." + DIR_DELIM + "minetest.conf");
 #endif
 
 		for(u32 i=0; i<filenames.size(); i++)
diff --git a/src/server.cpp b/src/server.cpp
index 69f655e6a..38cedd061 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -886,6 +886,10 @@ Server::Server(
 	// Figure out some paths
 	m_path_share = porting::path_share + DIR_DELIM + "server";
 	m_path_game = m_path_share + DIR_DELIM + "games" + DIR_DELIM + m_gamename;
+	m_path_addons.insert(m_path_share + DIR_DELIM + "addons"
+			+ DIR_DELIM + m_gamename);
+	m_path_addons.insert(porting::path_user + DIR_DELIM + "server"
+			+ DIR_DELIM + "addons" + DIR_DELIM + m_gamename);
 
 	// Path to builtin.lua
 	std::string builtinpath = m_path_share + DIR_DELIM + "builtin.lua";
diff --git a/src/servermain.cpp b/src/servermain.cpp
index 5eb5162ae..9be0c80ae 100644
--- a/src/servermain.cpp
+++ b/src/servermain.cpp
@@ -284,11 +284,14 @@ int main(int argc, char *argv[])
 		core::array<std::string> filenames;
 		filenames.push_back(porting::path_user +
 				DIR_DELIM + "minetest.conf");
+		// Legacy configuration file location
+		filenames.push_back(porting::path_user +
+				DIR_DELIM + ".." + DIR_DELIM + "minetest.conf");
 #ifdef RUN_IN_PLACE
 		// Try also from a lower level (to aid having the same configuration
 		// for many RUN_IN_PLACE installs)
 		filenames.push_back(porting::path_user +
-				DIR_DELIM + ".." + DIR_DELIM + "minetest.conf");
+				DIR_DELIM + ".." + DIR_DELIM + ".." + DIR_DELIM + "minetest.conf");
 #endif
 
 		for(u32 i=0; i<filenames.size(); i++)