diff --git a/Quake/bgmusic.c b/Quake/bgmusic.c
index e5f630af..cd0ab55f 100644
--- a/Quake/bgmusic.c
+++ b/Quake/bgmusic.c
@@ -53,11 +53,11 @@ typedef struct music_handler_s
 
 static music_handler_t wanted_handlers[] =
 {
-	{ CODECTYPE_OGG,  BGM_STREAMER, -1,  ".ogg", MUSIC_DIRNAME, NULL },
-	{ CODECTYPE_MP3,  BGM_STREAMER, -1,  ".mp3", MUSIC_DIRNAME, NULL },
-	{ CODECTYPE_FLAC, BGM_STREAMER, -1, ".flac", MUSIC_DIRNAME, NULL },
-	{ CODECTYPE_WAV,  BGM_STREAMER, -1,  ".wav", MUSIC_DIRNAME, NULL },
-	{ CODECTYPE_NONE, BGM_NONE,     -1,    NULL,         NULL,  NULL }
+	{ CODECTYPE_OGG,  BGM_STREAMER, -1,  "ogg", MUSIC_DIRNAME, NULL },
+	{ CODECTYPE_MP3,  BGM_STREAMER, -1,  "mp3", MUSIC_DIRNAME, NULL },
+	{ CODECTYPE_FLAC, BGM_STREAMER, -1, "flac", MUSIC_DIRNAME, NULL },
+	{ CODECTYPE_WAV,  BGM_STREAMER, -1,  "wav", MUSIC_DIRNAME, NULL },
+	{ CODECTYPE_NONE, BGM_NONE,     -1,   NULL,         NULL,  NULL }
 };
 
 static music_handler_t *music_handlers = NULL;
@@ -192,7 +192,7 @@ static void BGM_Play_noext (const char *filename, unsigned int allowed_types)
 			handler = handler->next;
 			continue;
 		}
-		q_snprintf(tmp, sizeof(tmp), "%s/%s%s",
+		q_snprintf(tmp, sizeof(tmp), "%s/%s.%s",
 			   handler->dir, filename, handler->ext);
 		switch (handler->player)
 		{
@@ -231,8 +231,8 @@ void BGM_Play (const char *filename)
 		return;
 	}
 
-	ext = S_FileExtension(filename);
-	if (!ext)	/* try all things */
+	ext = COM_FileGetExtension(filename);
+	if (! *ext)	/* try all things */
 	{
 		BGM_Play_noext(filename, ANY_CODECTYPE);
 		return;
@@ -304,7 +304,7 @@ void BGM_PlayCDtrack (byte track, qboolean looping)
 			goto _next;
 		if (! CDRIPTYPE(handler->type))
 			goto _next;
-		q_snprintf(tmp, sizeof(tmp), "%s/track%02d%s",
+		q_snprintf(tmp, sizeof(tmp), "%s/track%02d.%s",
 				MUSIC_DIRNAME, (int)track, handler->ext);
 		if (! COM_FileExists(tmp, &path_id))
 			goto _next;
@@ -321,7 +321,7 @@ void BGM_PlayCDtrack (byte track, qboolean looping)
 		Con_Printf("Couldn't find a cdrip for track %d\n", (int)track);
 	else
 	{
-		q_snprintf(tmp, sizeof(tmp), "%s/track%02d%s",
+		q_snprintf(tmp, sizeof(tmp), "%s/track%02d.%s",
 				MUSIC_DIRNAME, (int)track, ext);
 		bgmstream = S_CodecOpenStreamType(tmp, type);
 		if (! bgmstream)
diff --git a/Quake/q_sound.h b/Quake/q_sound.h
index 139c5fb2..71ca7ac4 100644
--- a/Quake/q_sound.h
+++ b/Quake/q_sound.h
@@ -118,9 +118,6 @@ void SND_Spatialize (channel_t *ch);
 /* music stream support */
 void S_RawSamples(int samples, int rate, int width, int channels, byte * data, float volume);
 
-/* returns file's extension including the dot, or NULL */
-const char *S_FileExtension (const char *name);
-
 /* initializes cycling through a DMA buffer and returns information on it */
 qboolean SNDDMA_Init(dma_t *dma);
 
diff --git a/Quake/snd_codec.c b/Quake/snd_codec.c
index c1ceaf2f..e9f7b8f8 100644
--- a/Quake/snd_codec.c
+++ b/Quake/snd_codec.c
@@ -132,8 +132,8 @@ snd_stream_t *S_CodecOpenStreamExt (const char *filename)
 	snd_stream_t *stream;
 	const char *ext;
 
-	ext = S_FileExtension(filename);
-	if (!ext)
+	ext = COM_FileGetExtension(filename);
+	if (! *ext)
 	{
 		Con_Printf("No extension for %s\n", filename);
 		return NULL;
@@ -163,15 +163,15 @@ snd_stream_t *S_CodecOpenStreamAny (const char *filename)
 	snd_stream_t *stream;
 	const char *ext;
 
-	ext = S_FileExtension(filename);
-	if (!ext)	/* try all available */
+	ext = COM_FileGetExtension(filename);
+	if (! *ext)	/* try all available */
 	{
 		char tmp[MAX_QPATH];
 
 		codec = codecs;
 		while (codec)
 		{
-			q_snprintf(tmp, sizeof(tmp), "%s%s", filename, codec->ext);
+			q_snprintf(tmp, sizeof(tmp), "%s.%s", filename, codec->ext);
 			stream = codec->codec_open(tmp);
 			if (stream)
 			{
diff --git a/Quake/snd_dma.c b/Quake/snd_dma.c
index a6ee27dd..7ed75223 100644
--- a/Quake/snd_dma.c
+++ b/Quake/snd_dma.c
@@ -264,29 +264,6 @@ static sfx_t *S_FindName (const char *name)
 }
 
 
-/*
-=================
-S_FileExtension
-
-return file's extension including the dot, or NULL
-=================
-*/
-const char *S_FileExtension (const char *name)
-{
-	const char *ptr = name + strlen(name) - 1;
-
-	while (ptr > name &&
-		(*ptr != '/' && *ptr != '\\'))
-	{
-		if (*ptr == '.')
-			return ptr;
-		ptr--;
-	}
-
-	return NULL;
-}
-
-
 /*
 ==================
 S_TouchSound
diff --git a/Quake/snd_mp3.c b/Quake/snd_mp3.c
index 736297b9..a778c4b5 100644
--- a/Quake/snd_mp3.c
+++ b/Quake/snd_mp3.c
@@ -546,7 +546,7 @@ snd_codec_t mp3_codec =
 {
 	CODECTYPE_MP3,
 	true,	/* always available. */
-	".mp3",
+	"mp3",
 	S_MP3_CodecInitialize,
 	S_MP3_CodecShutdown,
 	S_MP3_CodecOpenStream,
diff --git a/Quake/snd_mpg123.c b/Quake/snd_mpg123.c
index efb07b47..4ac75160 100644
--- a/Quake/snd_mpg123.c
+++ b/Quake/snd_mpg123.c
@@ -214,7 +214,7 @@ snd_codec_t mp3_codec =
 {
 	CODECTYPE_MP3,
 	false,
-	".mp3",
+	"mp3",
 	S_MP3_CodecInitialize,
 	S_MP3_CodecShutdown,
 	S_MP3_CodecOpenStream,
diff --git a/Quake/snd_vorbis.c b/Quake/snd_vorbis.c
index 94b7fcb8..272d9edf 100644
--- a/Quake/snd_vorbis.c
+++ b/Quake/snd_vorbis.c
@@ -120,7 +120,7 @@ static snd_stream_t *S_OGG_CodecOpenStream (const char *filename)
 
 static int S_OGG_CodecReadStream (snd_stream_t *stream, int bytes, void *buffer)
 {
-	int	section;	/* FIXME: handle section changes */
+	int	section;	/* FIXME: handle section changes! */
 	int	cnt, res, rem;
 	char *	ptr;
 
@@ -157,7 +157,7 @@ snd_codec_t ogg_codec =
 {
 	CODECTYPE_OGG,
 	false,
-	".ogg",
+	"ogg",
 	S_OGG_CodecInitialize,
 	S_OGG_CodecShutdown,
 	S_OGG_CodecOpenStream,
diff --git a/Quake/snd_wave.c b/Quake/snd_wave.c
index 37052cd5..5db35918 100644
--- a/Quake/snd_wave.c
+++ b/Quake/snd_wave.c
@@ -268,7 +268,7 @@ snd_codec_t wav_codec =
 {
 	CODECTYPE_WAVE,
 	true,	/* always available. */
-	".wav",
+	"wav",
 	S_WAV_CodecInitialize,
 	S_WAV_CodecShutdown,
 	S_WAV_CodecOpenStream,