diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 770f7691d..d444ce98c 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,9 @@
 D2X-Rebirth Changelog
 
+20120422
+--------
+main/automap.c: Change MarkerScale changing keys from KEY_COMMA and KEY_PERIOD to KEY_F11 and KEY_F12 respectively, so I can use the former as controls in the automap
+
 20120418
 --------
 main/gameseq.c, main/gameseq.h, main/gauges.c, main/multi.c, main/net_udp.c, main/state.c: Removed usage of 'oldmaxnet' variable when switching between coop and other game modes which would not be correctly set when coop mode is loaded from a netgame profile; Removed 'MaxNumNetPlayers' variable as already replaced by Netgame.max_numplayers
diff --git a/main/automap.c b/main/automap.c
index cc2d4f44d..325414a9b 100644
--- a/main/automap.c
+++ b/main/automap.c
@@ -647,11 +647,11 @@ int automap_key_command(window *wind, d_event *event, automap *am)
 			return 1;
 			
 #ifndef RELEASE
-		case KEY_COMMA:
+		case KEY_F11:	//KEY_COMMA:
 			if (MarkerScale>.5)
 				MarkerScale-=.5;
 			return 1;
-		case KEY_PERIOD:
+		case KEY_F12:	//KEY_PERIOD:
 			if (MarkerScale<30.0)
 				MarkerScale+=.5;
 			return 1;