diff --git a/src/menu-fn/m_customize.cpp b/src/menu-fn/m_customize.cpp
index e8a3330e..caa039b3 100644
--- a/src/menu-fn/m_customize.cpp
+++ b/src/menu-fn/m_customize.cpp
@@ -71,13 +71,31 @@ void cz_cbSprayChanged(void)
 
 void menu_customize_init(void)
 {
+	int sid = 0;
+	g_sprayscount = 0;
+
 	/* scan and cache the sprays */
-	searchhandle searchy = search_begin("*.bmp", TRUE, TRUE);
-	g_sprayscount = search_getsize(searchy);
+	searchhandle searchy = search_begin("*.*", TRUE, TRUE);
+	for (int i = 0; i < search_getsize(searchy); i++) {
+		string filename = search_getfilename(searchy, i);
+		string extension = substring(filename, strlen(filename) - 3, 3);
+
+		if (extension == "bmp" || extension == "png" || extension == "jpg") {
+			g_sprayscount++;
+		}
+	}
+
+	/* only allocate what we truly need */
 	g_sprays = memalloc(sizeof(string) * g_sprayscount);
-	for (int i = 0; i < g_sprayscount; i++) {
-		g_sprays[i] = search_getfilename(searchy, i);
-		precache_pic(g_sprays[i]);
+	for (int i = 0; i < search_getsize(searchy); i++) {
+		string filename = search_getfilename(searchy, i);
+		string extension = substring(filename, strlen(filename) - 3, 3);
+		
+		if (extension == "bmp" || extension == "png" || extension == "jpg") {
+			g_sprays[sid] = filename;
+			precache_pic(g_sprays[sid]);
+			sid++;
+		}
 	}
 	search_end(searchy);
 
diff --git a/valve/data.pk3dir/default.cfg b/valve/data.pk3dir/default.cfg
index b43f49f0..7f960506 100755
--- a/valve/data.pk3dir/default.cfg
+++ b/valve/data.pk3dir/default.cfg
@@ -89,7 +89,7 @@ seta "com_nogamedirnativecode" "0"
 seta "con_logcenterprint" "0"
 seta "con_notifylines" "0"
 seta "lang" "en_us"
-seta "r_imageexensions" "tga bmp pcx"
+seta "r_imageexensions" "tga bmp pcx png jpg"
 seta "scr_sshot_type" "tga"
 seta "media_repeat "0"
 seta net_masterextra1	"master.frag-net.com:27950"