diff --git a/.cvsignore b/.cvsignore
index 442e73e..a257270 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-sysstat-5.0.5.tar.bz2
+sysstat-6.0.1.tar.bz2
diff --git a/sources b/sources
index c9b0c42..dd3ba80 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5fbe915c32761f28e7af27a7f956f7f2  sysstat-5.0.5.tar.bz2
+42670b66b01b830f82e86117659cd43d  sysstat-6.0.1.tar.bz2
diff --git a/sysstat-4.0.1-config.patch b/sysstat-4.0.1-config.patch
index a12dd84..689bd41 100644
--- a/sysstat-4.0.1-config.patch
+++ b/sysstat-4.0.1-config.patch
@@ -1,15 +1,17 @@
---- sysstat-4.0.1/build/CONFIG.config	Sun Jun 24 10:10:30 2001
-+++ sysstat-4.0.1/build/CONFIG	Fri Jun 29 13:04:58 2001
-@@ -2,7 +2,7 @@
- # (C) 2000 Sebastien GODARD <sebastien.godard@wanadoo.fr>
+--- sysstat-6.0.1/build/CONFIG.config	2005-06-25 11:14:21.000000000 +0200
++++ sysstat-6.0.1/build/CONFIG	2005-10-07 14:33:05.400464184 +0200
+@@ -2,8 +2,8 @@
+ # (C) 2000 Sebastien GODARD (sysstat <at> wanadoo.fr)
  
  # Directories
 -PREFIX = /usr/local
+-SA_LIB_DIR = /usr/local/lib/sa
 +PREFIX = /usr
++SA_LIB_DIR = /usr/lib/sa
+ SADC_PATH = ${SA_LIB_DIR}/sadc
  SA_DIR = /var/log/sa
- CLEAN_SA_DIR = n
- 
-@@ -16,18 +16,21 @@
+ MAN_DIR = ${PREFIX}/man
+@@ -21,17 +21,19 @@
  endif
  
  # Uncomment this to enable workaround for Linux kernel SMP race condition
@@ -32,5 +34,3 @@
  INITD_DIR = init.d
  
  INSTALL_CRON = n
-+
- 
diff --git a/sysstat.spec b/sysstat.spec
index f6cf638..68e8eea 100644
--- a/sysstat.spec
+++ b/sysstat.spec
@@ -1,6 +1,6 @@
 Name: sysstat
-Version: 5.0.5
-Release: 11.fc
+Version: 6.0.1
+Release: 1
 Summary: The sar and iostat system monitoring commands.
 License: GPL
 Group: Applications/System
@@ -10,15 +10,7 @@ Source1: sysstat.crond
 Source2: sysstat.crondaily
 Source3: sysstat.sysconfig
 Patch0: sysstat-4.0.1-config.patch
-Patch1: sysstat-4.0.7-lib64.patch
-Patch2: sysstat-5.0.0-history.patch
-Patch3: sysstat-5.0.5-statreset.patch
-Patch4: sysstat-5.0.5-overrun.patch
-Patch5: sysstat-5.0.5-lib64init.patch
 Patch6: sysstat-5.0.5-append-msg.patch
-Patch7: sysstat-5.0.5-filename.patch
-Patch8: sysstat-5.0.5-gcc4fix.patch
-Patch9: sysstat-5.0.5-debug.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -35,21 +27,7 @@ activity.
 %prep
 %setup -q
 %patch0 -p1 -b .config
-%patch1 -p1 -b .lib64
-%patch2 -p1 -b .history
-%patch3 -p1 -b .statreset
-%patch4 -p1 -b .overrun
-# see patch5 below
 %patch6 -p1 -b .append-msg
-%patch7 -p1 -b .filename
-%patch8 -p1 -b .gcc4fix
-
-# Fix initscript for lib64 systems
-
-%if %_lib == "lib64"
-%patch5 -p1 -b .lib64init
-%endif
-%patch9 -p1 -b .debug
 
 %build
 # FIXME: I need to fix the upstream Makefile to use LIBDIR et al. properly and
@@ -120,6 +98,7 @@ rm -rf %{buildroot}
 %config(noreplace) /etc/cron.d/sysstat
 #config(noreplace) /etc/cron.daily/sysstat
 %config(noreplace) /etc/sysconfig/sysstat
+%config(noreplace) /etc/sysconfig/sysstat.ioconf
 %{_initrddir}/sysstat
 %{_bindir}/*
 %{_libdir}/sa
@@ -128,6 +107,9 @@ rm -rf %{buildroot}
 /var/log/sa
 
 %changelog
+* Fri Oct  7 2005 Ivana Varekova <varekova@redhat.com> 6.0.1-1
+- version 6.0.1
+
 * Thu Aug 18 2005 Florian La Roche <laroche@redhat.com>
 - no need to kernel kernel 2.2 or newer anymore