diff --git a/src/filesystem.cpp b/src/filesystem.cpp
index 434ac1486ab..25dc61ab535 100644
--- a/src/filesystem.cpp
+++ b/src/filesystem.cpp
@@ -408,6 +408,13 @@ std::string get_user_data_dir()
 		_mkdir("userdata");
 		_mkdir("userdata/editor");
 		_mkdir("userdata/editor/maps");
+		_mkdir("userdata/data");
+		_mkdir("userdata/data/ais");
+		_mkdir("userdata/data/scenarios");
+		_mkdir("userdata/data/scenarios/multiplayer");
+		_mkdir("userdata/data/maps");
+		_mkdir("userdata/data/maps/multiplayer");
+		_mkdir("userdata/saves");
 		inited_dirs = true;
 	}
 
@@ -464,6 +471,13 @@ std::string get_user_data_dir()
 		//also create the maps directory
 		mkdir((dir_path + "/editor").c_str(),AccessMode);
 		mkdir((dir_path + "/editor/maps").c_str(),AccessMode);
+		mkdir((dir_path + "/data").c_str(),AccessMode);
+		mkdir((dir_path + "/data/ais").c_str(),AccessMode);
+		mkdir((dir_path + "/data/scenarios").c_str(),AccessMode);
+		mkdir((dir_path + "/data/scenarios/multiplayer").c_str(),AccessMode);
+		mkdir((dir_path + "/data/maps").c_str(),AccessMode);
+		mkdir((dir_path + "/data/maps/multiplayer").c_str(),AccessMode);
+		mkdir((dir_path + "/saves").c_str(),AccessMode);
 		if(res == 0) {
 			dir = opendir(dir_path.c_str());
 		} else {