diff --git a/.cvsignore b/.cvsignore
index 5eaaafc..313e066 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-iptables-1.2.4.tar.bz2
+iptables-1.2.5.tar.bz2
diff --git a/iptables.spec b/iptables.spec
index c82cdb1..f45168b 100644
--- a/iptables.spec
+++ b/iptables.spec
@@ -1,12 +1,13 @@
 Name: iptables
 Summary: Tools for managing Linux kernel packet filtering capabilities.
-Version: 1.2.4
-Release: 2s.1
+Version: 1.2.5
+Release: 2
 Source: http://netfilter.kernelnotes.org/%{name}-%{version}.tar.bz2
 Source1: iptables.init
+Source2: ip6tables.init
 Patch1: iptables-1.2.2-bug50990.patch
 Group: System Environment/Base
-URL: http://netfilter.kernelnotes.org/
+URL: http://www.netfilter.org/
 BuildRoot: %{_tmppath}/%{name}-buildroot
 License: GPL
 BuildPrereq: /usr/bin/perl
@@ -50,42 +51,62 @@ OPT="$RPM_OPT_FLAGS"
 %endif
 make COPT_FLAGS="$OPT" LIBDIR=/lib
 make COPT_FLAGS="$OPT" LIBDIR=/lib iptables-save iptables-restore
+make COPT_FLAGS="$OPT" LIBDIR=/lib ip6tables-save ip6tables-restore
 
 %install
 make install DESTDIR=%{buildroot} BINDIR=/sbin LIBDIR=/lib MANDIR=%{_mandir}
-cp iptables-save $RPM_BUILD_ROOT/sbin
-cp iptables-restore $RPM_BUILD_ROOT/sbin
+cp ip{6,}tables-{save,restore} $RPM_BUILD_ROOT/sbin
 cp iptables-*.8 $RPM_BUILD_ROOT%{_mandir}/man8
 mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
 install -c -m755 %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/iptables
+install -c -m755 %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/ip6tables
 
 %clean
 rm -rf $RPM_BUILD_ROOT $RPM_BUILD_DIR/%{name}-%{version}
 
 %post
-chkconfig --add iptables
+/sbin/chkconfig --add iptables
 
 %preun
 if [ "$1" = 0 ]; then
-	chkconfig --del iptables
+	/sbin/chkconfig --del iptables
+fi
+
+%post ipv6
+/sbin/chkconfig --add ip6tables
+
+%preun ipv6
+if [ "$1" = 0 ]; then
+	/sbin/chkconfig --del ip6tables
 fi
 
 %files
 %defattr(-,root,root,0755)
 %config /etc/rc.d/init.d/iptables
 /sbin/iptables*
-%{_mandir}/*/*
+%{_mandir}/*/iptables*
 %dir /lib/iptables
 /lib/iptables/libipt*
 
 %files ipv6
 %defattr(-,root,root,0755)
-/sbin/ip6tables
+%config /etc/rc.d/init.d/ip6tables
+/sbin/ip6tables*
 /lib/iptables/libip6t*
+%{_mandir}/*/ip6tables*
 
 %changelog
-* Wed Mar 18 2003 D. Marlin <dmarlin@redhat.com>
-- new s390 release number and rebuild for s390 (bug #85960)
+* Tue Feb 12 2002 Bernhard Rosenkraenzer <bero@redhat.com> 1.2.5-2
+- Merge ip6tables improvements from Ian Prowell <iprowell@prowell.org>
+  #59402
+- Update URL (#59354)
+- Use /sbin/chkconfig rather than chkconfig in %postun script
+
+* Fri Jan 11 2002 Bernhard Rosenkraenzer <bero@redhat.com> 1.2.5-1
+- 1.2.5
+
+* Wed Jan 09 2002 Tim Powers <timp@redhat.com>
+- automated rebuild
 
 * Mon Nov  5 2001 Bernhard Rosenkraenzer <bero@redhat.com> 1.2.4-2
 - Fix %preun script
diff --git a/sources b/sources
index c58843a..bcdf619 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e78e5780bc61b9c3016b0ac312c7777f  iptables-1.2.4.tar.bz2
+3446aec70217df6cc5be7c155817f54e  iptables-1.2.5.tar.bz2