diff --git a/minetest.conf.example b/minetest.conf.example
index de3cf3243b95539ff7df689778b79983a296bdb7..50893c578faac1779a055c35d1ed1490b468aaf9 100644
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -96,7 +96,7 @@
 #client_unload_unused_data_timeout = 600
 #    Maximum number of mapblocks for client to be kept in memory
 #    Set to -1 for unlimited amount
-#client_mapblock_limit = 1000
+#client_mapblock_limit = 5000
 #    Whether to fog out the end of the visible area
 #enable_fog = true
 #    Whether to show the client debug info (has the same effect as hitting F5)
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 92d85c8304d5aee6b5b4192348d53bc822adcfe0..f0b02b2d9e3b1dc6a16aafa09f8e405b10ca8c2d 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -104,7 +104,7 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("address", "");
 	settings->setDefault("random_input", "false");
 	settings->setDefault("client_unload_unused_data_timeout", "600");
-	settings->setDefault("client_mapblock_limit", "1000");
+	settings->setDefault("client_mapblock_limit", "5000");
 	settings->setDefault("enable_fog", "true");
 	settings->setDefault("fov", "72");
 	settings->setDefault("view_bobbing", "true");
@@ -271,7 +271,6 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("max_clearobjects_extra_loaded_blocks", "4096");
 	settings->setDefault("time_send_interval", "5");
 	settings->setDefault("time_speed", "72");
-	settings->setDefault("year_days", "30");
 	settings->setDefault("server_unload_unused_data_timeout", "29");
 	settings->setDefault("max_objects_per_block", "49");
 	settings->setDefault("server_map_save_interval", "5.3");