diff --git a/.cvsignore b/.cvsignore
index 20a9780..d4905fc 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-thttpd-2.23beta1.tar.gz
+thttpd-2.25b.tar.gz
diff --git a/sources b/sources
index 9eca001..d0a6ee8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-43ec67b2765353a942fea72ceaf4d118  thttpd-2.23beta1.tar.gz
+a0e9cd87455d3a0ea11e5ea7e947adf6  thttpd-2.25b.tar.gz
diff --git a/thttpd.spec b/thttpd.spec
index 61a269c..1de0b9a 100644
--- a/thttpd.spec
+++ b/thttpd.spec
@@ -1,22 +1,21 @@
-# $Id: thttpd.spec,v 1.1 2004/11/09 02:50:44 cvsextras Exp $
+# $Id: thttpd.spec,v 1.2 2004/11/09 02:50:50 cvsextras Exp $
 
 %define webroot /var/www/thttpd
+#define prever  beta1
 
 Summary: Tiny, turbo, throttleable lightweight http server.
 Name: thttpd
-Version: 2.23beta1
-Release: 2.fr
+Version: 2.25b
+Release: %{?prever:0.%{prever}.}1.fr
 License: BSD
 Group: System Environment/Daemons
-Source0: http://www.acme.com/software/thttpd/thttpd-%{version}.tar.gz
+Source0: http://www.acme.com/software/thttpd/%{name}-%{version}%{?prever}.tar.gz
 Source1: thttpd.init
 Source10: index.html
 Source11: thttpd_powered_3.png
 Source12: button-freshrpms.png
 URL: http://www.acme.com/software/thttpd/
 BuildRoot: %{_tmppath}/%{name}-root
-PreReq: /sbin/service, /etc/init.d
-BuildRequires: perl
 
 %description
 Thttpd is a very compact no-frills httpd serving daemon that can handle
@@ -29,7 +28,7 @@ Available rpmbuild rebuild options :
 --with : indexes showversion expliciterrors
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}%{?prever}
 
 %build
 %configure
@@ -49,16 +48,16 @@ mkdir -p %{buildroot}%{_mandir}/man{1,8}
 mkdir -p %{buildroot}%{_sbindir}
 install -D -m 755 %{SOURCE1} %{buildroot}/etc/init.d/thttpd
 make install BINDIR=%{buildroot}%{_sbindir} \
-        MANDIR=%{buildroot}%{_mandir} \
-        WEBDIR=%{buildroot}%{webroot}/html \
-        CGIBINDIR=%{buildroot}%{webroot}/cgi-bin
+    MANDIR=%{buildroot}%{_mandir} \
+    WEBDIR=%{buildroot}%{webroot}/html \
+    CGIBINDIR=%{buildroot}%{webroot}/cgi-bin
 
 # Rename htpasswd in case apache is installed too
 mkdir -p %{buildroot}%{_bindir}
 mv %{buildroot}%{_sbindir}/htpasswd \
-        %{buildroot}%{_bindir}/htpasswd.thttpd
+    %{buildroot}%{_bindir}/htpasswd.thttpd
 mv %{buildroot}%{_mandir}/man1/htpasswd.1 \
-        %{buildroot}%{_mandir}/man1/htpasswd.thttpd.1
+    %{buildroot}%{_mandir}/man1/htpasswd.thttpd.1
 
 # Install the default index.html file
 install -m 644 %{SOURCE10} %{SOURCE11} %{SOURCE12} %{buildroot}%{webroot}/html/
@@ -68,12 +67,12 @@ cat << EOF > %{buildroot}%{_sysconfdir}/thttpd.conf
 # This section overrides defaults
 dir=%{webroot}/html
 chroot
-user=thttpd             # default = nobody
+user=thttpd         # default = nobody
 logfile=/var/log/thttpd.log
 pidfile=/var/run/thttpd.pid
 # This section _documents_ defaults in effect
 # port=80
-# nosymlink             # default = !chroot
+# nosymlink         # default = !chroot
 # novhost
 # nocgipat
 # nothrottles
@@ -84,22 +83,22 @@ EOF
 %pre
 /usr/sbin/groupadd -r www 2>/dev/null || :
 /usr/sbin/useradd -s /bin/false -c "Web server user" \
-        -d %{webroot} -M -r -g www thttpd 2>/dev/null || :
+    -d %{webroot} -M -r -g www thttpd 2>/dev/null || :
 
 %post
 if [ $1 = 1 ]; then
-        /sbin/chkconfig --add thttpd
+    /sbin/chkconfig --add thttpd
 fi
 
 %preun
 if [ $1 = 0 ]; then
-        /sbin/service thttpd stop > /dev/null 2>&1 || :
-        /sbin/chkconfig --del thttpd
+    /sbin/service thttpd stop > /dev/null 2>&1 || :
+    /sbin/chkconfig --del thttpd
 fi
 
 %postun
 if [ $1 -ge 1 ]; then
-        /sbin/service thttpd condrestart >/dev/null 2>&1 || :
+    /sbin/service thttpd condrestart >/dev/null 2>&1 || :
 fi
 
 %clean
@@ -124,6 +123,16 @@ rm -rf %{buildroot}
 %{_mandir}/man*/*
 
 %changelog
+* Sun Jan  4 2004 Matthias Saou <http://freshrpms.net/> - 2.25b-1.fr
+- Update to 2.25b.
+
+* Tue Nov 11 2003 Matthias Saou <http://freshrpms.net/> - 2.24-1.fr
+- Update to 2.24 final.
+
+* Fri Nov  7 2003 Matthias Saou <http://freshrpms.net/> - 2.23-0.beta1.3.fr
+- Rebuild for Fedora Core 1.
+- Escaped the %%install and others later in this changelog.
+
 * Wed Oct 22 2003 Matthias Saou <matthias.saou@est.une.marmotte.net>
 - Added build options and now default to no indexes, explicit errors or
   showing version.
@@ -176,7 +185,7 @@ rm -rf %{buildroot}
 
 * Wed Nov 24 1999 Bennett Todd <bet@mordor.net>
   - updated to 2.06, parameterized Version string in source url
-  - changed to use "make install", simplified %files list
+  - changed to use "make install", simplified %%files list
 
 * Wed Nov 10 1999 Bennett Todd <bet@mordor.net>
   - Version 2.05, reset release to 1
@@ -192,9 +201,9 @@ rm -rf %{buildroot}
 
 * Wed Feb 10 1999 Bennett Todd <bet@mordor.net>
   - based on 2.00-2, bumped to 2.04, reset release back to 1
-  - fixed a couple of broken entries in %install to reference %{buildroot}
-  - simplified %files to populate /usr/doc/... with just [A-Z]* (TODO had gone
+  - fixed a couple of broken entries in %%install to reference %{buildroot}
+  - simplified %%files to populate /usr/doc/... with just [A-Z]* (TODO had gone
     away, this simplification makes it liklier to be trivially portable to
     future releases).
-  - added %doc tags for the man pages
+  - added %%doc tags for the man pages