diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 8d7ca81d5..532d256e1 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -6,6 +6,7 @@ D1X-Rebirth Changelog
 main/menu.c: When changing resolutions and Game_wind is present, send EVENT_WINDOW_ACTIVATE shortly so it's canvase will align to the new resolution seamlessly
 main/titles.c: Generally use PATH_MAX for filename arrays in titles code
 main/console.c, main/inferno.c: Toggle console by KEY_SHIFTED+KEY_ESC again - as it should be
+arch/ogl/ogl.c, main/menu.c: in ogl_filltexbuf add pixel row matching color of bitmap edge to get a clean border when filtering cockpit overlay bitmaps; Small text correction for sound menu to fit better on screen
 
 20110115
 --------
diff --git a/arch/ogl/ogl.c b/arch/ogl/ogl.c
index 546ab69fb..010e10e5d 100644
--- a/arch/ogl/ogl.c
+++ b/arch/ogl/ogl.c
@@ -1287,6 +1287,14 @@ void ogl_filltexbuf(unsigned char *data, GLubyte *texp, int truewidth, int width
 					c = data[i++];
 				}
 			}
+			else if (x==width) // end of bitmap reached - fill this pixel with last color to make a clean border when filtering this texture
+			{
+				c = data[(width*(y+1))-1];
+			}
+			else if (y==height) // end of bitmap reached - fill this row with color or last row to make a clean border when filtering this texture
+			{
+				c = data[(width*(height-1))+x];
+			}
 			else
 			{
 				c = 256; // fill the pad space with transparency (or blackness)
diff --git a/main/menu.c b/main/menu.c
index 1fa964c41..8a5e39772 100644
--- a/main/menu.c
+++ b/main/menu.c
@@ -1788,7 +1788,7 @@ void do_sound_menu()
 	m[nitems].type = NM_TYPE_TEXT; m[nitems++].text = "cd music options:";
 
 	opt_sm_redbook_playorder = nitems;
-	m[nitems].type = NM_TYPE_CHECK; m[nitems].text = "force mac descent cd track order"; m[nitems++].value = GameCfg.OrigTrackOrder;
+	m[nitems].type = NM_TYPE_CHECK; m[nitems].text = "force mac cd track order"; m[nitems++].value = GameCfg.OrigTrackOrder;
 
 #ifdef USE_SDLMIXER
 	m[nitems].type = NM_TYPE_TEXT; m[nitems++].text = "";