diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index b20c06e79c..c278a4fe36 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,4 +1,8 @@
-March 22, 2009  (Changes by Graf Zahl)
+March 23, 2009  (Changes by Graf Zahl)
+- Changed: Making the gameinfo customizable by MAPINFO requires different
+  checks for map specific border flats.
+
+March 22, 2009  (Changes by Graf Zahl)
 - removed gamemission variable because it wasn't used anywhere.
 - removed gamemode variable. All it was used for were some checks that
   really should depend on GI_MAPxx.
diff --git a/src/g_mapinfo.cpp b/src/g_mapinfo.cpp
index 3bfee73fd0..face9f5d9c 100644
--- a/src/g_mapinfo.cpp
+++ b/src/g_mapinfo.cpp
@@ -259,7 +259,7 @@ void level_info_t::Reset()
 	intermusicorder = 0;
 	SoundInfo = "";
 	SndSeq = "";
-	strcpy (bordertexture, gameinfo.borderFlat);
+	bordertexture[0] = 0;
 	teamdamage = 0.f;
 	specialactions.Clear();
 }
diff --git a/src/r_draw.cpp b/src/r_draw.cpp
index e26b000481..c634650aa3 100644
--- a/src/r_draw.cpp
+++ b/src/r_draw.cpp
@@ -1823,7 +1823,7 @@ void R_DrawBorder (int x1, int y1, int x2, int y2)
 {
 	FTextureID picnum;
 
-	if (level.info != NULL)
+	if (level.info != NULL && level.info->bordertexture[0] != 0)
 	{
 		picnum = TexMan.CheckForTexture (level.info->bordertexture, FTexture::TEX_Flat);
 	}
diff --git a/wadsrc/static/mapinfo/doom1.txt b/wadsrc/static/mapinfo/doom1.txt
index 52facad4b4..5c8fc1dc9f 100644
--- a/wadsrc/static/mapinfo/doom1.txt
+++ b/wadsrc/static/mapinfo/doom1.txt
@@ -13,6 +13,7 @@ gameinfo
 	quitsound = "menu/quit1"
 	borderflat = "FLOOR7_2"
 	drawreadthis = true
+	intermissionmusic = "$MUSIC_INTER"
 }
 
 clearepisodes