diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 11c923750..4bdef74e4 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -5,6 +5,7 @@ D1X-Rebirth Changelog
 main/console.c: When printing Gamelog, make sure canvas is NULL
 main/newmenu.c, main/multi.c, main/game.c, ui/inputbox.c, ui/menubar.c, arch/sdl/event.c, arch/sdl/key.c, arch/include/key.h: Yet another UNICODE overhaul - Using seperate buffer for UNICODE chars and only use it in key_ascii() while still using keysyms for the rest of the program so we do not screw up readings by key values altered by modifers - possibly still room to optimize
 main/game.c: Fixed cheats!
+main/automap.c: Changed keys for Automap Viewing Distance to F9/F10 - Minus/Equal is not Layout independent
 
 20081115
 --------
diff --git a/main/automap.c b/main/automap.c
index 1264bd083..d89d7f610 100644
--- a/main/automap.c
+++ b/main/automap.c
@@ -252,14 +252,14 @@ void draw_automap(int flip)
 	{
 		gr_printf((SWIDTH/4.923), (SHEIGHT/1.126), TXT_TURN_SHIP);
 		gr_printf((SWIDTH/4.923), (SHEIGHT/1.083), TXT_SLIDE_UPDOWN);
-		gr_printf((SWIDTH/4.923), (SHEIGHT/1.043), TXT_VIEWING_DISTANCE);
+		gr_printf((SWIDTH/4.923), (SHEIGHT/1.043), "F9/F10 Changes viewing distance");
 	}
 	else
 	{
 		// for the Mac automap they're shown up the top, hence the different layout
 		gr_printf(265*(SWIDTH/640.0), 27*(SHEIGHT/480.0), TXT_TURN_SHIP);
 		gr_printf(265*(SWIDTH/640.0), 44*(SHEIGHT/480.0), TXT_SLIDE_UPDOWN);
-		gr_printf(265*(SWIDTH/640.0), 61*(SHEIGHT/480.0), TXT_VIEWING_DISTANCE);
+		gr_printf(265*(SWIDTH/640.0), 61*(SHEIGHT/480.0), "F9/F10 Changes viewing distance");
 	}
 	
 	gr_set_current_canvas(&Automap_view);
@@ -487,13 +487,13 @@ void do_automap( int key_code )	{
 				break;
 #endif
 
-			case KEY_MINUS:
+			case KEY_F9:
 				if (SegmentLimit > 1) 		{
 					SegmentLimit--;
 					adjust_segment_limit(SegmentLimit);
 				}
 				break;
-			case KEY_EQUAL:
+			case KEY_F10:
 				if (SegmentLimit < Max_segments_away) 	{
 					SegmentLimit++;
 					adjust_segment_limit(SegmentLimit);