diff --git a/config/menus_edit.cfg b/config/menus_edit.cfg
index 382ec337..efde4d04 100644
--- a/config/menus_edit.cfg
+++ b/config/menus_edit.cfg
@@ -6,7 +6,7 @@ menuitem (_ [Mapmodels...])         [ showmenu Mapmodels ]
 menuitem (_ [Lighting...])          [ showmenu Lighting ]
 menuitem (_ [Entities...])          [ showmenu Entities ]
 menuitem (_ [Pickups...])           [ showmenu Pickups ]
-menuitem (_ [Test a skymap...])     [ showmenu skymaps ]
+menuitem (_ [Skymaps...])           [ showmenu skymaps ]
 menuitem (_ [Ambient sounds...])    [ showmenu [Ambient sounds] ]
 menuitem (_ [Arches and slopes...]) [ showmenu Arches ]
 menuitem (_ [Map operations...])    [ showmenu [Map operations] ]
@@ -110,22 +110,39 @@ menuitem [] -1
 menuitem (_ [Fix heightfielding]) [ solid 0; slope 0 0 ]
 
 newmenu skymaps
-
-menuinit [ echo Please read: (red)/docs/mapediting5.html to find out how to PERMANENTLY add a custom skymap to your map... ]
-
-menuitem (_ [At sea skymap])      [ loadsky "kothic/atsea" ]
-menuitem (_ [Canyons1 skymap])    [ loadsky "ladynighthawk/inhcanyons1" ]
-menuitem (_ [Graveyard skymap])	  [ loadsky "socksky/grave" ]
-menuitem (_ [Ice Station skymap])	[ loadsky "iceflow/iceflow" ]
-menuitem (_ [Mountain skymap])	  [ loadsky "makke/mountain" ]
-menuitem (_ [Nightball skymap])	  [ loadsky "socksky/nightball" ]
-menuitem (_ [Powerlines skymap])  [ loadsky "humus/powerlines" ]
-menuitem (_ [Rocky skymap])		    [ loadsky "makke/rocky" ]
-menuitem (_ [Sand skymap])		    [ loadsky "makke/sand" ]
-menuitem (_ [Steini2 skymap])	    [ loadsky "steini/steini2" ]
-menuitem (_ [Steini3 skymap])	    [ loadsky "steini/steini3" ]
-menuitem (_ [Steini4 skymap])	    [ loadsky "steini/steini4" ]
-
+menuinit [
+    delmenu skymaps
+    newmenu skymaps
+    if (&& $editing (! (getautomapconfig))) [
+        menuitem [Enable automapconfig to make changes permanent] [automapconfig ; closemenu (curmenu)] (concat loadsky (escape $loadsky))
+        menuitem "" -1 (concat loadsky (escape $loadsky))
+    ]
+    menuitem (concat "Current skymap:" $loadsky) (concat loadsky (escape $loadsky))
+    menuitem "" -1 (concat loadsky (escape $loadsky))
+    push offskies ""
+    push userskies ""
+    push skyname ""
+    looplist (gettexturelist skymaps/ "" _ft.jpg) [c1 c2 c3 c4] [
+        skyname = (escape (concatword $c3 "/" $c4))
+        if (strcmp official (gettextureorigin (concatword $c1 "/" $c2))) [
+            offskies = (concat $offskies $skyname)
+        ] [
+            userskies = (concat $userskies $skyname)
+        ]
+    ]
+    menuitem "Official skymaps:" -1 (concat loadsky (escape $loadsky))
+    looplist $offskies skyname [
+        menuitem (concat "   " $skyname) (concat loadsky $skyname) (concat loadsky $skyname)
+    ]
+    if (strlen $userskies) [
+        menuitem "" -1 (concat loadsky (escape $loadsky))
+        menuitem "Custom/downloaded skymaps:" -1 (concat loadsky (escape $loadsky))
+        looplist $userskies skyname [
+            menuitem (concat "   " $skyname) (concat loadsky (escape $skyname)) (concat loadsky (escape $skyname))
+        ]
+    ]
+    pop offskies userskies skyname
+]
 
 _closestenttypestatus = 0
 //Map operations