diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index dd4a5c0f0..6ebf08155 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,4 +1,10 @@
 January 27, 2008 (Changes by Graf Zahl)
+- added a mastervolume CVAR for Timidity because for me its output is considerably 
+  louder than everything else.
+- reverted removal of AddPatch call in crosshair initialization.
+- Modified makewad.c so that it doesn't write file names with '[]^' to the 
+  dependency file. Apparenly make can't handle these names and an incomplete
+  list is still better than something that doesn't work at all.
 - Changed license for r_data.cpp because there isn't anything of id's original
   code left in that file.
 - Cleaned up r_data.cpp.
diff --git a/src/g_shared/shared_sbar.cpp b/src/g_shared/shared_sbar.cpp
index 84cb9ee37..52d5299fc 100644
--- a/src/g_shared/shared_sbar.cpp
+++ b/src/g_shared/shared_sbar.cpp
@@ -114,7 +114,7 @@ CUSTOM_CVAR (Int, crosshair, 0, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
 			strcpy (name, "XHAIRS1");
 		}
 	}
-	CrosshairImage = TexMan[name];
+	CrosshairImage = TexMan[TexMan.AddPatch (name)];
 }
 
 CVAR (Color, crosshaircolor, 0xff0000, CVAR_ARCHIVE|CVAR_GLOBALCONFIG);
diff --git a/src/sound/music_midi_timidity.cpp b/src/sound/music_midi_timidity.cpp
index de27bba0b..f969a16fd 100644
--- a/src/sound/music_midi_timidity.cpp
+++ b/src/sound/music_midi_timidity.cpp
@@ -1,6 +1,7 @@
 #include "i_musicinterns.h"
 #include "c_cvars.h"
 #include "cmdlib.h"
+#include "templates.h"
 
 #if !defined(_WIN32) && 0
 // Under Linux, buffer output from Timidity to try to avoid "bubbles"
@@ -56,6 +57,17 @@ CVAR (String, timidity_reverb, "0", CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
 CVAR (Bool, timidity_stereo, true, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
 CVAR (Bool, timidity_8bit, false, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
 CVAR (Bool, timidity_byteswap, false, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
+// added because Timidity's output is rather loud.
+CUSTOM_CVAR (Float, timidity_mastervolume, 1.0f, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
+{
+	if (self < 0.f)
+		self = 0.f;
+	else if (self > 4.f)
+		self = 4.f;
+	else if (currSong != NULL && !currSong->IsMIDI ())
+		currSong->SetVolume (clamp<float> (snd_musicvolume, 0.f, 1.f));
+}
+
 
 CUSTOM_CVAR (Int, timidity_pipe, 60, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
 { // pipe size in ms
@@ -82,7 +94,7 @@ void TimiditySong::Play (bool looping)
 	{
 		if (m_Stream != NULL)
 		{
-			if (m_Stream->Play (true, snd_musicvolume))
+			if (m_Stream->Play (true, timidity_mastervolume * snd_musicvolume))
 			{
 				m_Status = STATE_Playing;
 			}
@@ -582,6 +594,11 @@ bool TimiditySong::FillStream (SoundStream *stream, void *buff, int len, void *u
 	return true;
 }
 
+void TimiditySong::SetVolume (float volume)
+{
+	if (m_Stream!=NULL) m_Stream->SetVolume (volume*timidity_mastervolume);
+}
+
 bool TimiditySong::IsPlaying ()
 {
 #ifdef _WIN32
diff --git a/tools/makewad/makewad.c b/tools/makewad/makewad.c
index 5fe54662b..0cc1e1f8b 100644
--- a/tools/makewad/makewad.c
+++ b/tools/makewad/makewad.c
@@ -323,7 +323,9 @@ int buildwad (FILE *listfile, char *listfilename, const char *makecmd, char *mak
 				{
 					fprintf (wadfile, " \\\n\t\"%s\"", filename);
 				}
-				else
+				// ARGH! Stupid make. Too bad but then these files can't be checked. 
+				// Still better than something that doesn't work at all though!
+				else if (!strpbrk(filename, "[]^"))	
 				{
 					fprintf (wadfile, " \\\n\t%s", filename);
 				}