diff --git a/configure.in b/configure.in
index 3319500..83b3380 100644
--- a/configure.in
+++ b/configure.in
@@ -90,4 +90,4 @@ AC_OUTPUT(Makefile alsactl/Makefile alsamixer/Makefile amidi/Makefile amixer/Mak
 	  aplay/Makefile include/Makefile iecset/Makefile utils/Makefile \
 	  utils/alsa-utils.spec seq/Makefile seq/aconnect/Makefile \
 	  seq/aplaymidi/Makefile seq/aseqdump/Makefile seq/aseqnet/Makefile \
-	  speaker-test/Makefile)
+	  speaker-test/Makefile speaker-test/samples/Makefile)
diff --git a/speaker-test/Makefile.am b/speaker-test/Makefile.am
index c80e3fb..6777c4c 100644
--- a/speaker-test/Makefile.am
+++ b/speaker-test/Makefile.am
@@ -1,5 +1,7 @@
 SPEAKER_TEST_VERSION = 0.0.8
 INCLUDES = -I$(top_srcdir)/include -DVERSION=\"$(SPEAKER_TEST_VERSION)\"
+SUBDIRS= samples
+
 bin_PROGRAMS = speaker-test
 speaker_test_SOURCES = speaker-test.c pink.c
 man_MANS = speaker-test.1
diff --git a/speaker-test/samples/Makefile.am b/speaker-test/samples/Makefile.am
new file mode 100644
index 0000000..8cc3546
--- /dev/null
+++ b/speaker-test/samples/Makefile.am
@@ -0,0 +1,20 @@
+sounddir = $(datadir)/sounds/alsa
+wav_files = Front_Left.wav \
+	Rear_Center.wav \
+	Rear_Right.wav \
+	Side_Right.wav \
+	Front_Center.wav \
+	Front_Right.wav \
+	Noise.wav \
+	Rear_Left.wav \
+	Side_Left.wav  
+sound_DATA = $(wav_files)
+
+alsadir = $(datadir)/alsa/speaker-test
+cfg_files = sample_map.csv
+
+alsa_DATA = $(cfg_files)
+
+EXTRA_DIST = \
+	$(wav_files) \
+	$(cfg_files)
diff --git a/speaker-test/samples/sample_map.csv b/speaker-test/samples/sample_map.csv
new file mode 100644
index 0000000..20d8ed2
--- /dev/null
+++ b/speaker-test/samples/sample_map.csv
@@ -0,0 +1,2 @@
+0, "Front Left", "/usr/share/alsa/samples/Front_Left.wav"
+1, "Front Right", "/usr/share/alsa/samples/Front_Right.wav"