diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index c090bfc0c..2bce8c1b8 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -4,6 +4,7 @@ D1X-Rebirth Changelog
 --------
 arch/sdl/digi.c, main/digi.h, main/songs.c, misc/hmp.c: Bail out of hmp_reset() if midiOutOpen fails and return error with -debug set; execute hmp_reset() before first song plays; renamed digi_win32_stop_current_song() to digi_win32_stop_midi_song() to keep naming convention; Fixed some compiler warnings
 main/net_udp.c, main/net_udp.h: Fixed typo in Packets per sec. in GAME_RULES screen; Reduced max amount of games shown on netlist to 900 to reduce RAM usage... as if we'd ever reach this
+main/automap.c: properly check and fix viewMatrix in free flight auotmap
 
 20110714
 --------
diff --git a/main/automap.c b/main/automap.c
index 076dabc89..bcff789e9 100644
--- a/main/automap.c
+++ b/main/automap.c
@@ -184,6 +184,8 @@ ubyte Automap_visited[MAX_SEGMENTS];
 void adjust_segment_limit(automap *am, int SegmentLimit);
 void draw_all_edges(automap *am);
 void automap_build_edge_list(automap *am);
+// extern
+void check_and_fix_matrix(vms_matrix *m);
 
 #define	MAX_DROP_MULTI	2
 #define	MAX_DROP_SINGLE	9
@@ -482,6 +484,7 @@ int automap_process_input(window *wind, d_event *event, automap *am)
 			vm_angles_2_matrix(&tempm, &tangles);
 			vm_matrix_x_matrix(&new_m,&am->viewMatrix,&tempm);
 			am->viewMatrix = new_m;
+			check_and_fix_matrix(&am->viewMatrix);
 		}
 		
 		if ( am->controls.forward_thrust_time || am->controls.vertical_thrust_time || am->controls.sideways_thrust_time )