diff --git a/Makefile.am b/Makefile.am
index 4611e87ed..1ea6ec2c8 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = @BULLETTREE@ src wavs models oggs doc data fonts
+SUBDIRS = @BULLETTREE@ src sfx models oggs doc data fonts
 
 EXTRA_DIST = README README.cygwin README.macosx README.windows ChangeLog COPYING missing
 
diff --git a/sfx/Makefile.am b/sfx/Makefile.am
new file mode 100644
index 000000000..d45ada669
--- /dev/null
+++ b/sfx/Makefile.am
@@ -0,0 +1,9 @@
+# wavs/
+
+pkgdatadir = $(datadir)/games/@PACKAGE@/sfx
+
+pkgdata_DATA = $(wildcard *.wav)
+
+SUBDIRS = radio tintagel
+
+EXTRA_DIST = $(pkgdata_DATA)
diff --git a/wavs/bzzt.wav b/sfx/bzzt.wav
similarity index 100%
rename from wavs/bzzt.wav
rename to sfx/bzzt.wav
diff --git a/wavs/explosion.wav b/sfx/explosion.wav
similarity index 100%
rename from wavs/explosion.wav
rename to sfx/explosion.wav
diff --git a/wavs/radio/Makefile.am b/sfx/radio/Makefile.am
similarity index 100%
rename from wavs/radio/Makefile.am
rename to sfx/radio/Makefile.am
diff --git a/wavs/radio/README b/sfx/radio/README
similarity index 100%
rename from wavs/radio/README
rename to sfx/radio/README
diff --git a/wavs/radio/grandprix_winner.wav b/sfx/radio/grandprix_winner.wav
similarity index 100%
rename from wavs/radio/grandprix_winner.wav
rename to sfx/radio/grandprix_winner.wav
diff --git a/wavs/radio/horn.wav b/sfx/radio/horn.wav
similarity index 100%
rename from wavs/radio/horn.wav
rename to sfx/radio/horn.wav
diff --git a/wavs/radio/radarping.wav b/sfx/radio/radarping.wav
similarity index 100%
rename from wavs/radio/radarping.wav
rename to sfx/radio/radarping.wav
diff --git a/wavs/radio/shot.wav b/sfx/radio/shot.wav
similarity index 100%
rename from wavs/radio/shot.wav
rename to sfx/radio/shot.wav
diff --git a/wavs/radio/slap.wav b/sfx/radio/slap.wav
similarity index 100%
rename from wavs/radio/slap.wav
rename to sfx/radio/slap.wav
diff --git a/wavs/radio/squeaky.wav b/sfx/radio/squeaky.wav
similarity index 100%
rename from wavs/radio/squeaky.wav
rename to sfx/radio/squeaky.wav
diff --git a/wavs/tintagel/Makefile.am b/sfx/tintagel/Makefile.am
similarity index 100%
rename from wavs/tintagel/Makefile.am
rename to sfx/tintagel/Makefile.am
diff --git a/wavs/tintagel/README b/sfx/tintagel/README
similarity index 100%
rename from wavs/tintagel/README
rename to sfx/tintagel/README
diff --git a/wavs/tintagel/crash.wav b/sfx/tintagel/crash.wav
similarity index 100%
rename from wavs/tintagel/crash.wav
rename to sfx/tintagel/crash.wav
diff --git a/wavs/tintagel/deselect_option.wav b/sfx/tintagel/deselect_option.wav
similarity index 100%
rename from wavs/tintagel/deselect_option.wav
rename to sfx/tintagel/deselect_option.wav
diff --git a/wavs/tintagel/energy_bar_full.wav b/sfx/tintagel/energy_bar_full.wav
similarity index 100%
rename from wavs/tintagel/energy_bar_full.wav
rename to sfx/tintagel/energy_bar_full.wav
diff --git a/wavs/tintagel/grab_collectable.wav b/sfx/tintagel/grab_collectable.wav
similarity index 100%
rename from wavs/tintagel/grab_collectable.wav
rename to sfx/tintagel/grab_collectable.wav
diff --git a/wavs/tintagel/move_option.wav b/sfx/tintagel/move_option.wav
similarity index 100%
rename from wavs/tintagel/move_option.wav
rename to sfx/tintagel/move_option.wav
diff --git a/wavs/tintagel/pre_start_race.wav b/sfx/tintagel/pre_start_race.wav
similarity index 100%
rename from wavs/tintagel/pre_start_race.wav
rename to sfx/tintagel/pre_start_race.wav
diff --git a/wavs/tintagel/select_option.wav b/sfx/tintagel/select_option.wav
similarity index 100%
rename from wavs/tintagel/select_option.wav
rename to sfx/tintagel/select_option.wav
diff --git a/wavs/tintagel/start_race.wav b/sfx/tintagel/start_race.wav
similarity index 100%
rename from wavs/tintagel/start_race.wav
rename to sfx/tintagel/start_race.wav
diff --git a/wavs/ugh.wav b/sfx/ugh.wav
similarity index 100%
rename from wavs/ugh.wav
rename to sfx/ugh.wav
diff --git a/wavs/wee.wav b/sfx/wee.wav
similarity index 100%
rename from wavs/wee.wav
rename to sfx/wee.wav
diff --git a/src/file_manager.cpp b/src/file_manager.cpp
index 532bdb650..d3ce223e7 100644
--- a/src/file_manager.cpp
+++ b/src/file_manager.cpp
@@ -230,7 +230,7 @@ std::string FileManager::getMusicFile(const std::string& fname) const
 //-----------------------------------------------------------------------------
 std::string FileManager::getSFXFile(const std::string& fname) const
 {
-    return m_root_dir+"/wavs/"+fname;
+    return m_root_dir+"/sfx/"+fname;
 }   // getSFXFile
 //-----------------------------------------------------------------------------
 std::string FileManager::getFontFile(const std::string& fname) const
@@ -295,4 +295,4 @@ void FileManager::listFiles(std::set<std::string>& result, const std::string& di
         ulCloseDir(mydir);
 }   // listFiles
 
-//-----------------------------------------------------------------------------
\ No newline at end of file
+//-----------------------------------------------------------------------------
diff --git a/wavs/Makefile.am b/wavs/Makefile.am
deleted file mode 100644
index 4330f56e0..000000000
--- a/wavs/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-# wavs/
-
-pkgdatadir = $(datadir)/games/@PACKAGE@/wavs
-
-pkgdata_DATA = $(wildcard *.wav)
-
-SUBDIRS = radio tintagel
-
-EXTRA_DIST = $(pkgdata_DATA)
\ No newline at end of file