diff -Naur speech-dispatcher-0.3.vanilla/config/Makefile.am speech-dispatcher-0.3/config/Makefile.am
--- speech-dispatcher-0.3.vanilla/config/Makefile.am	2003-10-07 16:52:00.000000000 +0000
+++ speech-dispatcher-0.3/config/Makefile.am	2004-04-12 12:54:15.052250800 +0000
@@ -2,11 +2,11 @@
 
 SUBDIRS= modules clients
 
-all-local: speechd.conf
+all-local: speech-dispatcher.conf
 
-speechd.conf: speechd.conf.in
-	sed -e s:INCLUDE_PATH:\"$(spdconfdir)\":g speechd.conf.in > speechd.conf
+speech-dispatcher.conf: speechd.conf.in
+	sed -e s:INCLUDE_PATH:\"$(spdconfdir)\":g speechd.conf.in > speech-dispatcher.conf
 
 
-spdconf_DATA= speechd.conf
+spdconf_DATA= speech-dispatcher.conf
 EXTRA_DIST = speechd.conf.in
diff -Naur speech-dispatcher-0.3.vanilla/config/speechd.conf.in speech-dispatcher-0.3/config/speechd.conf.in
--- speech-dispatcher-0.3.vanilla/config/speechd.conf.in	2004-02-13 14:55:01.000000000 +0000
+++ speech-dispatcher-0.3/config/speechd.conf.in	2004-04-12 12:41:04.108492000 +0000
@@ -28,7 +28,7 @@
 # Specify "stdout" for standard console output
 # or a full path to some file which the log should be written to.
 
-LogFile  "/var/log/speechd.log"
+LogFile  "/var/log/speech-dispatcher.log"
 #LogFile  "stdout"
 
 # CustomLogFile allows logging all messages of the given kind, regardless their
@@ -170,5 +170,5 @@
 # it should apply this settings (it does glob-style matching, you can use
 # * to match any number of characters and ? to match one character)
 
-# Include "clients/emacs.conf"
+Include "clients/emacs.conf"
 
diff -Naur speech-dispatcher-0.3.vanilla/configure.in speech-dispatcher-0.3/configure.in
--- speech-dispatcher-0.3.vanilla/configure.in	2004-03-31 00:30:08.000000000 +0000
+++ speech-dispatcher-0.3/configure.in	2004-04-12 12:41:04.111492000 +0000
@@ -50,7 +50,7 @@
 AC_SUBST(spdconfdir)
 snddatadir="$datadir/sounds/speech-dispatcher/" 
 AC_SUBST(snddatadir)
-modulebindir="$bindir/speechd-modules/" 
+modulebindir="$libdir/speech-dispatcher-modules/" 
 AC_SUBST(modulebindir)
 moduleconfdir="$sysconfdir/speech-dispatcher/modules/" 
 AC_SUBST(moduleconfdir)
diff -Naur speech-dispatcher-0.3.vanilla/src/server/speechd.c speech-dispatcher-0.3/src/server/speechd.c
--- speech-dispatcher-0.3.vanilla/src/server/speechd.c	2004-03-31 00:33:52.000000000 +0000
+++ speech-dispatcher-0.3/src/server/speechd.c	2004-04-12 12:45:41.593308424 +0000
@@ -356,7 +356,7 @@
 {
     int START_NUM_FD = 16;
     configfile_t *configfile = NULL;
-    char *configfilename = SYS_CONF"/speechd.conf" ;
+    char *configfilename = SYS_CONF"/speech-dispatcher.conf" ;
     int ret;
     char *p;
     int i;
@@ -449,7 +449,7 @@
 void
 speechd_load_configuration(int sig)
 {
-    char *configfilename = SYS_CONF"/speechd.conf";
+    char *configfilename = SYS_CONF"/speech-dispatcher.conf";
     configfile_t *configfile = NULL;
 
     /* Clean previous configuration */