diff --git a/Maintenance/rpm/GNUmakefile b/Maintenance/rpm/GNUmakefile
index d265c8706c6..c8dfb2c05f8 100644
--- a/Maintenance/rpm/GNUmakefile
+++ b/Maintenance/rpm/GNUmakefile
@@ -1,5 +1,5 @@
 CGAL_URL := $(shell ./get_cgal_trunk_url)
-CGAL_MANUAL_REVISION := $(shell awk 'BEGIN {print FS=" "} /Version:/ {print $$2}' SPECS/CGAL-manual-tools.spec)
+CGAL_MANUAL_REVISION:=$(shell awk 'BEGIN {FS=" "} /Version:/ {print $$2}' SPECS/CGAL-manual-tools.spec)
 
 .PHONY: \
         SOURCES/Manual_tools.tar.gz \
@@ -11,13 +11,13 @@ prepare-CGAL-manual-tools-sources: SOURCES/Manual_tools.tar.gz \
 SOURCES/Manual_tools.tar.gz:
 	cd SOURCES && svn export -r $(CGAL_MANUAL_REVISION) --force \
 	    $(CGAL_URL)/Manual_tools && \
-	tar czf Manual_tools.tar.gz Manual_tools/
+	tar czf Manual_tools-$(CGAL_MANUAL_REVISION).tar.gz Manual_tools/
 	rm -rf SOURCES/Manual_tools/
 
 SOURCES/Manual.tar.gz:
 	cd SOURCES && svn export -r $(CGAL_MANUAL_REVISION) --force \
 	    $(CGAL_URL)/Manual && \
-	tar czf Manual.tar.gz -C Manual/ .
+	tar czf Manual-$(CGAL_MANUAL_REVISION).tar.gz -C Manual/ .
 	rm -rf SOURCES/Manual/
 
 -include my_makefile
diff --git a/Maintenance/rpm/SPECS/CGAL-manual-tools.spec b/Maintenance/rpm/SPECS/CGAL-manual-tools.spec
index 91c6fdc952b..62dc48e5a01 100644
--- a/Maintenance/rpm/SPECS/CGAL-manual-tools.spec
+++ b/Maintenance/rpm/SPECS/CGAL-manual-tools.spec
@@ -1,13 +1,13 @@
 Name:           CGAL-manual-tools
-Version:        29933
+Version:        30025
 Release:        1%{?dist}
 Summary:        CC Manual Style and LaTeX Converter for HTML.
 
 Group:          Development/Tools
 License:        N/A
 URL:            http://www.cgal.org/Members/Manual_tools/
-Source0:        Manual_tools.tar.gz
-Source1:        Manual.tar.gz
+Source0:        Manual_tools-%{version}.tar.gz
+Source1:        Manual-%{version}.tar.gz
 Patch0:         CGAL_manual_tools-config.patch
 Patch1:         CGAL_manual_tools-rpm.patch
 Patch2:         CGAL_manual_tools-perl.patch
@@ -79,6 +79,10 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/CGAL_latex_conv_config/gif
 
 %changelog
+* Wed Apr  5 2006 Laurent Rineau <laurent.rineau@ens.fr> - 30025
+- Updated to revision 30025.
+- Source0 and Source1 now have %version in their names.
+
 * Tue Apr  4 2006 Laurent Rineau <laurent.rineau@ens.fr> - 29933
 - Updated to revision 29933