diff --git a/.gitignore b/.gitignore
index f4af604..b9bc769 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,21 @@
+/.build-*
+/noarch/
+/x86_64/
+/festival/
+/*.src.rpm
+festdoc-1.4.2.tar.gz
+festival-1.96-17.fc15.src.rpm
+festival-1.96-beta.tar.gz
+festival-2.1-release.tar.gz
+festlex_CMU.tar.gz
+festlex_POSLEX.tar.gz
+festvox_kallpc16k.tar.gz
+festvox_kedlpc16k.tar.gz
 festival-spanish-voices_1.0.0.orig.tar.gz
+festvox_nitech_us_awb_arctic_hts.tar.bz2
+festvox_nitech_us_bdl_arctic_hts.tar.bz2
+festvox_nitech_us_clb_arctic_hts.tar.bz2
+festvox_nitech_us_jmk_arctic_hts.tar.bz2
+festvox_nitech_us_rms_arctic_hts.tar.bz2
+festvox_nitech_us_slt_arctic_hts.tar.bz2
+speech_tools-1.2.96-beta.tar.gz
diff --git a/festival.spec b/festival.spec
index f5d8dc1..aac1819 100644
--- a/festival.spec
+++ b/festival.spec
@@ -6,7 +6,7 @@
 Name: festival
 Summary: Speech synthesis and text-to-speech system
 Version: %{festivalversion}
-Release: 17%{?dist}
+Release: 18%{?dist}
 
 URL: http://www.cstr.ed.ac.uk/projects/festival/
 Group: Applications/Multimedia
@@ -591,6 +591,18 @@ pushd speech_tools
     mv $RPM_BUILD_ROOT%{_includedir}/speech_tools/EST/*.h \
        $RPM_BUILD_ROOT%{_includedir}/speech_tools/
     rmdir $RPM_BUILD_ROOT%{_includedir}/speech_tools/EST
+    mv $RPM_BUILD_ROOT%{_includedir}/speech_tools/unix/EST/EST_* \
+       $RPM_BUILD_ROOT%{_includedir}/speech_tools/unix/
+    rmdir $RPM_BUILD_ROOT%{_includedir}/speech_tools/unix/EST
+    mv $RPM_BUILD_ROOT%{_includedir}/speech_tools/instantiate/EST/instantiate/EST_* \
+       $RPM_BUILD_ROOT%{_includedir}/speech_tools/instantiate/
+    rm -rf $RPM_BUILD_ROOT%{_includedir}/speech_tools/instantiate/EST
+    mv $RPM_BUILD_ROOT%{_includedir}/speech_tools/sigpr/EST/EST_* \
+       $RPM_BUILD_ROOT%{_includedir}/speech_tools/sigpr
+    rmdir $RPM_BUILD_ROOT%{_includedir}/speech_tools/sigpr/EST
+    mv $RPM_BUILD_ROOT%{_includedir}/speech_tools/ling_class/EST/EST_* \
+       $RPM_BUILD_ROOT%{_includedir}/speech_tools/ling_class
+    rmdir $RPM_BUILD_ROOT%{_includedir}/speech_tools/ling_class/EST
   popd
 
   cp README ../README.speechtools
@@ -874,8 +886,10 @@ fi
 %{_includedir}/festival/*
 
 
-
 %changelog
+* Tue Feb 22 2011 Tim Niemueller <tim@niemueller.de> - 1.96-18
+- Fix install paths of speech_tools includes (rhbz #242607)
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.96-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild