diff --git a/baseq3r/music/Rockabuddy.ogg b/baseq3r/music/Rockabuddy.ogg
deleted file mode 100644
index be879da2..00000000
Binary files a/baseq3r/music/Rockabuddy.ogg and /dev/null differ
diff --git a/baseq3r/music/amp6_22k.ogg b/baseq3r/music/amp6_22k.ogg
deleted file mode 100644
index 13b3da6f..00000000
Binary files a/baseq3r/music/amp6_22k.ogg and /dev/null differ
diff --git a/baseq3r/music/amp6_22k.wav b/baseq3r/music/amp6_22k.wav
new file mode 100644
index 00000000..9c281a18
Binary files /dev/null and b/baseq3r/music/amp6_22k.wav differ
diff --git a/baseq3r/music/q3r_bgm1.ogg b/baseq3r/music/q3r_bgm1.ogg
deleted file mode 100644
index 886ebc06..00000000
Binary files a/baseq3r/music/q3r_bgm1.ogg and /dev/null differ
diff --git a/baseq3r/music/q3r_menumusic.ogg b/baseq3r/music/q3r_menumusic.ogg
deleted file mode 100644
index bb8c3150..00000000
Binary files a/baseq3r/music/q3r_menumusic.ogg and /dev/null differ
diff --git a/baseq3r/music/q3r_menumusic.wav b/baseq3r/music/q3r_menumusic.wav
new file mode 100644
index 00000000..c7bc749c
Binary files /dev/null and b/baseq3r/music/q3r_menumusic.wav differ
diff --git a/engine/code/game/bg_public.h b/engine/code/game/bg_public.h
index 0d1d4d1e..8cce8cf6 100644
--- a/engine/code/game/bg_public.h
+++ b/engine/code/game/bg_public.h
@@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // second version that must match between game and cgame
 
 // STONELANCE
-#define GAME_VERSION            "Q3Rally v0.1 Pre-Alpha build 17"
+#define GAME_VERSION            "Q3Rally v0.1 Pre-Alpha build 18"
 // END
 
 #define	DEFAULT_GRAVITY		800
diff --git a/engine/code/qcommon/q_shared.h b/engine/code/qcommon/q_shared.h
index b0208e27..ea59f90f 100644
--- a/engine/code/qcommon/q_shared.h
+++ b/engine/code/qcommon/q_shared.h
@@ -44,7 +44,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #endif
 
 #ifdef _MSC_VER
-  #define PRODUCT_VERSION "0.1 build 17"
+  #define PRODUCT_VERSION "0.1 build 18"
 #endif
 
 #define Q3_VERSION PRODUCT_NAME " " PRODUCT_VERSION
diff --git a/q3rallycode.ppr b/q3rallycode.ppr
index d39622b2..476b4767 100644
--- a/q3rallycode.ppr
+++ b/q3rallycode.ppr
@@ -863,7 +863,7 @@ q3rallycode
 7=engine\code\qcommon\files.c
 [Selected Project Files]
 Main=
-Selected=engine\code\qcommon\q_shared.h
+Selected=engine\code\game\bg_public.h
 [engine\misc\nsis\q3rally.nsi.in]
 TopLine=89
 Caret=1,103