--- festival-1.4.3.orig/src/arch/festival/Makefile
+++ festival-1.4.3/src/arch/festival/Makefile
@@ -62,6 +62,6 @@
 LOCAL_INCLUDES += $(FESTIVAL_INCLUDES)
 
 festival.o: festival.cc
-	$(CXX_COMMAND_TEMPLATES) -DFTNAME='$(PROJECT_NAME)' -DFTLIBDIRC='$(FTLIBDIR)' -DFTVERSION='$(PROJECT_VERSION)' -DFTSTATE='$(PROJECT_STATE)'  -DFTDATE='$(PROJECT_DATE)' -DFTOSTYPE=\"$(SYSTEM_TYPE)\" festival.cc
+	$(CXX_COMMAND_TEMPLATES) -DFTNAME='$(PROJECT_NAME)' -DFTVERSION='$(PROJECT_VERSION)' -DFTSTATE='$(PROJECT_STATE)'  -DFTDATE='$(PROJECT_DATE)' -DFTOSTYPEC='$(SYSTEM_TYPE)' festival.cc
 
 
--- festival-1.4.3.orig/doc/Makefile
+++ festival-1.4.3/doc/Makefile
@@ -44,7 +44,7 @@
 
 EXAMPLE_TO_DOCUMENT=
 
-FESTIVAL=$(TOP)/bin/festival --libdir $(TOP)/lib
+FESTIVAL=$(TOP)/src/main/festival --libdir $(TOP)/lib --datadir $(TOP)/lib
 
 # Include some of EST documentation.
 DOCXX_EXTRA_FILES = 
@@ -56,7 +56,8 @@
 	     banner.inc $(DOCXXIMAGES)
 
 MANPAGES = festival.head festival.tail \
-           festival_client.head festival_client.tail
+           festival_client.head festival_client.tail \
+		   text2wave.head text2wave.tail
 
 #SGMLFILES = festival.sgml \
 #	introductory.sgml basics.sgml core.sgml advanced.sgml programming.sgml
@@ -64,7 +65,7 @@
 FILES=Makefile $(MANPAGES) festival.texi $(SGMLFILES) refcard.tex  $(DOCXXFILES)
 LOCAL_CLEAN = *.aux *.cp *.fn *.ky *.log *.pg *.toc *.tp *.vr
 
-ALL = festival.1 festival_client.1
+ALL = festival.1 festival_client.1 text2wave.1
 
 include $(TOP)/config/common_make_rules
 include $(EST)/config/rules/doc.mak
@@ -72,9 +73,9 @@
 %.1 : %.head %.options %.tail 
 	cat $^ >$@
 %.options : $(TOP)/src/main/%
-	$(TOP)/bin/$* -man_options >$@
+	$(TOP)/src/main/$* -man_options >$@
 %.options : $(TOP)/src/main/%.exe
-	$(TOP)/bin/$* -man_options >$@
+	$(TOP)/src/main/$* -man_options >$@
 
 festival.info: festival.texi festfunc.texi festvars.texi festfeat.texi
 	@ if [ ! -d info ] ; \
@@ -104,8 +105,8 @@
 	tex festival.texi
 doc:	festival.ps festival.html festival.info
 
-festfunc.texi festvars.texi festfeat.texi: $(TOP)/src/main/festival
-	echo "(load_library \"festdoc.scm\") (make-doc)" | $(FESTIVAL)
+festfunc.texi festvars.texi festfeat.texi: $(TOP)/src/main/festival doc.scm
+	$(FESTIVAL) < doc.scm
 
 refcard.dvi:	refcard.tex
 	latex refcard.tex
--- festival-1.4.3.orig/Makefile
+++ festival-1.4.3/Makefile
@@ -51,7 +51,7 @@
 ALL = .config_error $(BUILD_DIRS)
 
 # Try and say if config hasn't been created
-config_dummy := $(shell test -f config/config || ( echo '*** '; echo '*** Making default config file ***'; echo '*** '; ./configure; )  >&2)
+#config_dummy := $(shell test -f config/config || ( echo '*** '; echo '*** Making default config file ***'; echo '*** '; ./configure; )  >&2)
 
 # force a check on the system file
 system_dummy := $(shell $(MAKE) -C $(TOP)/config -f make_system.mak TOP=.. system.mak)
@@ -75,8 +75,9 @@
 test:
 	@ $(MAKE) --no-print-directory -C testsuite test
 
-config/config: config/config.in config.status
-	./config.status
+# Conflicts with Debian build setup
+#config/config: config/config.in config.status
+#	./config.status
 
 configure: configure.in
 	autoconf