diff --git a/CMakeLists.txt b/CMakeLists.txt
index d89e7d580..50e88beb8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1125,6 +1125,9 @@ set(EXPECTED_DATA
   mapres/winter_mountains2.png
   mapres/winter_mountains3.png
   maps/Gold\ Mine.map
+  maps/LearnToPlay.map
+  maps/Sunny\ Side\ Up.map
+  maps/Tsunami.map
   maps/ctf1.map
   maps/ctf2.map
   maps/ctf3.map
@@ -1140,6 +1143,9 @@ set(EXPECTED_DATA
   maps/dm9.map
   maps/license.txt
   maps7/Gold\ Mine.map
+  maps7/LearnToPlay.map
+  maps7/Sunny\ Side\ Up.map
+  maps7/Tsunami.map
   maps7/readme.txt
   menuimages/demos.png
   menuimages/editor.png
diff --git a/autoexec_server.cfg b/autoexec_server.cfg
index 3986fc3c0..a81b8aef7 100644
--- a/autoexec_server.cfg
+++ b/autoexec_server.cfg
@@ -33,7 +33,7 @@ sv_rcon_mod_password ""
 sv_rcon_helper_password ""
 
 # Map to start server with
-sv_map "Gold Mine"
+sv_map "Sunny Side Up"
 
 # Whether this is a test server and rcon cheats are allowed. Also indicated in
 # the server type, which is:
@@ -128,6 +128,9 @@ sv_reset_file "reset.cfg"
 # You can learn more about tunes on http://ddnet.tw/settingscommands/#tunings
 
 add_vote "Map: Gold Mine" "change_map \"Gold Mine\""
+add_vote "Map: LearnToPlay" "change_map \"LearnToPlay\""
+add_vote "Map: Sunny Side Up" "change_map \"Sunny Side Up\""
+add_vote "Map: Tsunami" "change_map \"Tsunami\""
 add_vote " " "info"
 add_vote "Option: Normal gravity" "tune gravity 0.50"
 add_vote "Option: Moon gravity" "tune gravity 0.25"
diff --git a/data/maps/LearnToPlay.map b/data/maps/LearnToPlay.map
new file mode 100644
index 000000000..ddb8533a9
Binary files /dev/null and b/data/maps/LearnToPlay.map differ
diff --git a/data/maps/Sunny Side Up.map b/data/maps/Sunny Side Up.map
new file mode 100644
index 000000000..3c43cfa82
Binary files /dev/null and b/data/maps/Sunny Side Up.map differ
diff --git a/data/maps/Tsunami.map b/data/maps/Tsunami.map
new file mode 100644
index 000000000..92a1f7941
Binary files /dev/null and b/data/maps/Tsunami.map differ
diff --git a/data/maps/license.txt b/data/maps/license.txt
index e2428ca7c..c29db17fb 100644
--- a/data/maps/license.txt
+++ b/data/maps/license.txt
@@ -1,3 +1,15 @@
 Gold Mine:
 Copyright <BµmM>
 CC-BY-SA license
+
+LearnToPlay:
+Copyright Tridemy & Cøke
+CC-BY-SA license
+
+Sunny Side Up:
+Copyright Ravie
+CC-BY-SA license, grass_main is redrawn from original Teeworlds grass_main mapres (Apache 2.0 license)
+
+Tsunami:
+Copyright louis
+CC-BY-SA license
diff --git a/data/maps7/Gold Mine.map b/data/maps7/Gold Mine.map
index e2d5269fe..7a4796de1 100644
Binary files a/data/maps7/Gold Mine.map and b/data/maps7/Gold Mine.map differ
diff --git a/data/maps7/LearnToPlay.map b/data/maps7/LearnToPlay.map
new file mode 100644
index 000000000..ce002d54c
Binary files /dev/null and b/data/maps7/LearnToPlay.map differ
diff --git a/data/maps7/Sunny Side Up.map b/data/maps7/Sunny Side Up.map
new file mode 100644
index 000000000..16855527f
Binary files /dev/null and b/data/maps7/Sunny Side Up.map differ
diff --git a/data/maps7/Tsunami.map b/data/maps7/Tsunami.map
new file mode 100644
index 000000000..288da660b
Binary files /dev/null and b/data/maps7/Tsunami.map differ