diff common/game.c common/game.c
--- common/game.c	Tue Jul 11 10:14:53 2000
+++ common/game.c	Tue Jul 11 10:20:41 2000
@@ -762,7 +762,7 @@
   game.occupychance= GAME_DEFAULT_OCCUPYCHANCE;
   game.heating     = 0;
   game.cooling     = 0;
-  sz_strlcpy(game.save_name, "civgame");
+  sz_strlcpy(game.save_name, GAME_DEFAULT_SAVENAME);
   game.save_nturns=10;
   game.randseed=GAME_DEFAULT_RANDSEED;
 
diff common/game.h common/game.h
--- common/game.h	Tue Jul 11 10:13:50 2000
+++ common/game.h	Tue Jul 11 10:19:28 2000
@@ -319,6 +319,7 @@
 #define GAME_MIN_OCCUPYCHANCE        0
 #define GAME_MAX_OCCUPYCHANCE        100
 
+#define GAME_DEFAULT_SAVENAME        "civgame"
 #define GAME_DEFAULT_RULESET         "default"
 
 #define GAME_DEFAULT_SKILL_LEVEL 3      /* easy */
diff server/gamehand.c server/gamehand.c
--- server/gamehand.c	Tue Jul 11 10:13:50 2000
+++ server/gamehand.c	Tue Jul 11 10:19:28 2000
@@ -343,6 +343,10 @@
     game.save_nturns = secfile_lookup_int(file, "game.save_nturns");
   }
 
+  sz_strlcpy(game.save_name,
+	     secfile_lookup_str_default(file, GAME_DEFAULT_SAVENAME,
+					"game.save_name"));
+
   game.fogofwar = secfile_lookup_int_default(file, 0, "game.fogofwar");
   game.fogofwar_old = game.fogofwar;
 
@@ -614,6 +618,7 @@
   secfile_insert_int(file, game.razechance, "game.razechance");
   secfile_insert_int(file, game.civstyle, "game.civstyle");
   secfile_insert_int(file, game.save_nturns, "game.save_nturns");
+  secfile_insert_str(file, game.save_name, "game.save_name");
   secfile_insert_int(file, game.aifill, "game.aifill");
   secfile_insert_int(file, game.scorelog, "game.scorelog");
   secfile_insert_int(file, game.spacerace, "game.spacerace");
diff server/stdinhand.c server/stdinhand.c
--- server/stdinhand.c	Tue Jul 11 10:13:50 2000
+++ server/stdinhand.c	Tue Jul 11 10:19:28 2000
@@ -616,6 +616,15 @@
     N_("The game will be automatically saved per this number of turns.\n"
        "Zero means never auto-save.") },
 
+  { "savename", NULL,
+    SSET_META, SSET_SERVER_ONLY,
+    0, 0, 0,
+    N_("Auto-save name prefix"),
+    N_("Automatically saved games will have name \"<prefix><year>.sav\".\n"
+       "This setting sets <prefix> part."),
+    game.save_name, GAME_DEFAULT_SAVENAME,
+    sizeof(game.save_name) },
+
   { "scorelog", &game.scorelog,
     SSET_META, SSET_SERVER_ONLY,
     GAME_MIN_SCORELOG, GAME_MAX_SCORELOG, GAME_DEFAULT_SCORELOG,