diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am
index 93b3d79..0faf1c0 100644
--- a/alsactl/Makefile.am
+++ b/alsactl/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = init
+
 sbin_PROGRAMS=alsactl
 man_MANS=alsactl.1 alsactl_init.7
 EXTRA_DIST=alsactl.1 alsactl_init.xml
diff --git a/alsactl/init/Makefile.am b/alsactl/init/Makefile.am
new file mode 100644
index 0000000..2a7e13f
--- /dev/null
+++ b/alsactl/init/Makefile.am
@@ -0,0 +1,7 @@
+
+init_files = \
+	00main help info test \
+	hda
+EXTRA_DIRST = $(init_files)
+alsainitdir = $(datadir)/alsa/init
+alsainit_DATA = $(init_files)
diff --git a/configure.in b/configure.in
index 2484971..d478224 100644
--- a/configure.in
+++ b/configure.in
@@ -93,8 +93,11 @@ case "$dir" in
 *) dir="$prefix/share"
 esac
 
-dir="$dir/sounds/alsa"
-AC_DEFINE_UNQUOTED(DATADIR, "$dir", [directory containing sample data])
+soundsdir="$dir/sounds/alsa"
+AC_DEFINE_UNQUOTED(SOUNDSDIR, "$soundsdir", [directory containing sample data])
+
+mydatadir="$dir/alsa"
+AC_DEFINE_UNQUOTED(DATADIR, "$mydatadir", [directory containing alsa configuration])
 
 AC_ARG_WITH(testsound,
   [  --with-testsound=file        give the path of test sound file for alsaconf],
@@ -117,7 +120,8 @@ AC_SYS_LARGEFILE
 
 SAVE_UTIL_VERSION
 
-AC_OUTPUT(Makefile alsactl/Makefile alsamixer/Makefile amidi/Makefile amixer/Makefile \
+AC_OUTPUT(Makefile alsactl/Makefile alsactl/init/Makefile \
+	  alsamixer/Makefile amidi/Makefile amixer/Makefile \
 	  m4/Makefile po/Makefile.in \
 	  alsaconf/alsaconf alsaconf/Makefile \
 	  alsaconf/po/Makefile \
diff --git a/speaker-test/speaker-test.c b/speaker-test/speaker-test.c
index 22d13bf..57a7cbc 100644
--- a/speaker-test/speaker-test.c
+++ b/speaker-test/speaker-test.c
@@ -81,7 +81,7 @@ static pink_noise_t pink;
 static snd_pcm_uframes_t  buffer_size;
 static snd_pcm_uframes_t  period_size;
 static const char *given_test_wav_file = NULL;
-static char *wav_file_dir = DATADIR;
+static char *wav_file_dir = SOUNDSDIR;
 
 static const char        *channel_name[MAX_CHANNELS] = {
   N_("Front Left"),