diff --git a/Maintenance/rpm/GNUmakefile b/Maintenance/rpm/GNUmakefile
index e6d1f0c2f94..01d482570ab 100644
--- a/Maintenance/rpm/GNUmakefile
+++ b/Maintenance/rpm/GNUmakefile
@@ -47,14 +47,12 @@ CGAL_MANUAL_PACKAGE_DEPS = \
         $(CGAL_MANUAL_PACKAGE_SOURCES) \
 	SPECS/CGAL-manual-tools.spec
 
-.PHONY:: prepare-CGAL-manual-tools-sources echo-manual-revision
-
-echo-manual-revision:
-	@echo "CGAL_MANUAL_REVISION=$(CGAL_MANUAL_REVISION)"
+.PHONY:: prepare-CGAL-manual-tools-sources
 
 prepare-CGAL-manual-tools-sources: $(CGAL_MANUAL_PACKAGE_SOURCES)
 
-SOURCES/Manual_tools-$(CGAL_MANUAL_REVISION).tar.gz: echo-manual-revision
+SOURCES/Manual_tools-$(CGAL_MANUAL_REVISION).tar.gz: 
+	@echo "CGAL_MANUAL_REVISION=$(CGAL_MANUAL_REVISION)"
 	cd SOURCES && svn export -r $(CGAL_MANUAL_REVISION) --force \
 	    $(CGAL_URL)/Manual_tools && \
 	tar czf Manual_tools-$(CGAL_MANUAL_REVISION).tar.gz Manual_tools/
diff --git a/Maintenance/rpm/SOURCES/CGAL_manual_tools-rpm.patch b/Maintenance/rpm/SOURCES/CGAL_manual_tools-rpm.patch
index fd3a2579e48..5bd62ae3cd0 100644
--- a/Maintenance/rpm/SOURCES/CGAL_manual_tools-rpm.patch
+++ b/Maintenance/rpm/SOURCES/CGAL_manual_tools-rpm.patch
@@ -1,14 +1,11 @@
---- /tmp/ediff1660Atb	2007-05-11 16:44:47.000000000 +0200
-+++ /home/lrineau/CGAL/Packages/trunk/Manual_tools/install.sh	2007-05-11 16:43:42.000000000 +0200
-@@ -2,6 +2,12 @@
+diff -up /media/1/tmp/rineau-BUILD/Manual_tools/install.sh.rpm /media/1/tmp/rineau-BUILD/Manual_tools/install.sh
+--- /media/1/tmp/rineau-BUILD/Manual_tools/install.sh.rpm	2007-02-20 23:12:23.000000000 +0100
++++ install.sh	2008-09-18 16:22:33.000000000 +0200
+@@ -2,6 +2,8 @@
  
    . ./install.config
  
 +make -C src LATEX_CONV_INPUTS=$LATEX_CONV_INPUTS || exit 1
-+
-+LATEX_CONV_BIN=${RPM_BUILD_ROOT}${LATEX_CONV_BIN}
-+LATEX_CONV_CONFIG=${RPM_BUILD_ROOT}${LATEX_CONV_CONFIG}
-+STYLE_FILES=${RPM_BUILD_ROOT}${STYLE_FILES}
 +
  install -d $LATEX_CONV_BIN $LATEX_CONV_CONFIG $STYLE_FILES $STYLE_FILES/eps_tabs $STYLE_FILES/eps_tabs_grey
  
diff --git a/Maintenance/rpm/SPECS/CGAL-manual-tools.spec b/Maintenance/rpm/SPECS/CGAL-manual-tools.spec
index 45d9eda3c7e..ef15dfe4f59 100644
--- a/Maintenance/rpm/SPECS/CGAL-manual-tools.spec
+++ b/Maintenance/rpm/SPECS/CGAL-manual-tools.spec
@@ -20,24 +20,24 @@ Patch6:         CGAL_manual_tools-cc_ref_wizard.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: bison flex
-BuildRequires:  /usr/bin/kpsewhich
+BuildRequires: tetex-fonts
 Requires:       tetex-latex tetex-dvips 
 Requires:       ghostscript >= 6.0
-Requires(post):   /usr/bin/texhash
-Requires(postun): /usr/bin/texhash
+Requires(post):   tetex-fonts
+Requires(postun): tetex-fonts
 
 %description
 Specification and Manual Writing Tools for C++ Reference Manuals
 
 %prep
 %setup -q -n Manual_tools -a 1
-%patch0 -p0
-%patch1 -p0
-%patch2 -p0
-%patch3 -p0
-%patch4 -p0
-%patch5 -p0
-%patch6 -p0
+%patch0 -p0 -b .config
+%patch1 -p0 -b .rpm
+%patch2 -p0 -b .perl
+%patch3 -p0 -b .cgal_manual
+%patch4 -p0 -b .cc_extract
+%patch5 -p0 -b .latex_to_html
+%patch6 -p0 -b .cc_ref_wizard
 
 %build
 source install.config
@@ -45,15 +45,16 @@ make -C src LATEX_CONV_INPUTS=$LATEX_CONV_INPUTS \
             CXXFLAGS="${CXXFLAGS:-%optflags}" || exit 1
 
 %install
-rm -rf $RPM_BUILD_ROOT
-sed -i.bak -e 's|/usr|$RPM_BUILD_ROOT/usr|g' install.config
+rm -rf %{buildroot}
+sed -i.bak -e 's|/usr|%{buildroot}/usr|g' install.config
 ./install.sh
-[ -d $RPM_BUILD_ROOT/usr/share/texmf/tex/latex/CGAL ] || mkdir -p $RPM_BUILD_ROOT/usr/share/texmf/tex/latex/CGAL
-cp -r doc_tex/Manual $RPM_BUILD_ROOT/usr/share/texmf/tex/latex/CGAL
-cp doc_tex/ipe.sty $RPM_BUILD_ROOT/usr/share/texmf/tex/latex/CGAL
-[ -d $RPM_BUILD_ROOT/usr/share/texmf/bibtex/bib/CGAL ] || mkdir -p $RPM_BUILD_ROOT/usr/share/texmf/bibtex/bib/CGAL/Manual
-mv $RPM_BUILD_ROOT/usr/share/texmf/tex/latex/CGAL/Manual/*.bib $RPM_BUILD_ROOT/usr/share/texmf/bibtex/bib/CGAL/Manual
-cp developer_scripts/cgal_manual developer_scripts/bibmerge $RPM_BUILD_ROOT/usr/bin/ 
+[ -d %{buildroot}%{_datadir}/texmf/tex/latex/CGAL ] || mkdir -p %{buildroot}%{_datadir}/texmf/tex/latex/CGAL
+cp -r doc_tex/Manual %{buildroot}%{_datadir}/texmf/tex/latex/CGAL
+cp doc_tex/ipe.sty %{buildroot}%{_datadir}/texmf/tex/latex/CGAL
+[ -d %{buildroot}%{_datadir}/texmf/bibtex/bib/CGAL ] || mkdir -p %{buildroot}%{_datadir}/texmf/bibtex/bib/CGAL/Manual
+mv %{buildroot}%{_datadir}/texmf/tex/latex/CGAL/Manual/*.bib %{buildroot}%{_datadir}/texmf/bibtex/bib/CGAL/Manual
+[ -d %{buildroot}%{_bindir}/ ] || mkdir -p %{buildroot}%{_bindir}/
+install -p developer_scripts/cgal_manual developer_scripts/bibmerge %{buildroot}%{_bindir}/ 
 
 %post
 texhash > /dev/null 2>&1 || :
@@ -62,16 +63,16 @@ texhash > /dev/null 2>&1 || :
 texhash > /dev/null 2>&1 || :
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
 %doc doc_ps/*
-/usr/bin/*
-/usr/share/texmf/tex/latex/CGAL
-/usr/share/texmf/bibtex/bib/CGAL
-%dir /usr/share/CGAL/
-/usr/share/CGAL/latex_conv_config
+%{_bindir}/*
+%{_datadir}/texmf/tex/latex/CGAL
+%{_datadir}/texmf/bibtex/bib/CGAL
+%dir %{_datadir}/CGAL/
+%{_datadir}/CGAL/latex_conv_config
 
 %changelog
 * Fri May 11 2007 Laurent Rineau <laurent.rineau__fedora_extras@normalesup.org> - 38638-1%{?dist}