diff --git a/.cvsignore b/.cvsignore
index fd511d2..180e647 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-tuned-0.1.6.tar.bz2
+tuned-0.2.1.tar.bz2
diff --git a/sources b/sources
index ffbbe5f..dbc3629 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e19139f31271496607e8c4f368b7b365  tuned-0.1.6.tar.bz2
+af4b7edaf24e0e9e0d7d44cf52c551c2  tuned-0.2.1.tar.bz2
diff --git a/tuned.spec b/tuned.spec
index 1853744..892e811 100644
--- a/tuned.spec
+++ b/tuned.spec
@@ -1,7 +1,7 @@
 Summary: A dynamic adaptive system tuning daemon
 Name: tuned
-Version: 0.1.6
-Release: 2%{?dist}
+Version: 0.2.1
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 # The source for this package was pulled from upstream git.  Use the
@@ -18,6 +18,7 @@ Requires(preun): chkconfig
 Requires(preun): initscripts
 Requires(postun): initscripts
 BuildArch: noarch
+Requires: kobo
 
 %description
 The tuned package contains a daemon that tunes system settings dynamically.
@@ -52,43 +53,65 @@ rm -rf %{buildroot}
 
 %post
 /sbin/chkconfig --add tuned
+/sbin/chkconfig --add ktune
 
 %preun
 if [ $1 = 0 ] ; then
     /sbin/service tuned stop >/dev/null 2>&1
     /sbin/chkconfig --del tuned
+    /sbin/service ktune stop >/dev/null 2>&1
+    /sbin/chkconfig --del ktune
 fi
 
 %postun
 if [ "$1" -ge "1" ] ; then
     /sbin/service tuned condrestart >/dev/null 2>&1 || :
+    /sbin/service ktune condrestart >/dev/null 2>&1 || :
 fi
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING INSTALL NEWS README doc/DESIGN.txt doc/TIPS.txt
+%doc AUTHORS ChangeLog COPYING INSTALL NEWS README doc/DESIGN.txt doc/TIPS.txt ktune/README.ktune
 %{_initddir}/tuned
 %config(noreplace) %{_sysconfdir}/tuned.conf
 %{_sbindir}/tuned
+%{_sbindir}/tuned-adm
+%{_sysconfdir}/tune-profiles
 %{_datadir}/tuned
 %{_mandir}/man5/*
 %{_mandir}/man8/*
+%attr(0755,root,root) %{_initddir}/ktune
+%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/sysconfig/ktune
+%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/sysctl.ktune
+%dir %attr(0755,root,root) %{_sysconfdir}/ktune.d
 
 %files utils
 %defattr(-,root,root,-)
 %doc doc/README.utils
+%doc doc/README.scomes
+%{_sbindir}/varnetload
 %{_sbindir}/netdevstat
 %{_sbindir}/diskdevstat
 %{_sbindir}/scomes
-%{_sbindir}/varnetload
+
 
 %changelog
+* Tue Aug 04 2009 Phil Knirsch <pknirsch@redhat.com> - 0.2.1-1
+- Added first set of profiles
+- Added tuned-adm tool for profile switching
+- Fixed several issues with the tuned-adm tool
+
+* Mon Jul 27 2009 Thomas Woerner <twoerner@redhat.com> - 0.2.0-1
+- Integrated ktune-0.4
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Mon Jul 13 2009 Marcela Mašláňová <mmaslano@redhat.com> - 0.1.6-1
-- on popular demand update to the latest release with brand new scomes
- and varnetload
+* Thu Jul 16 2009 Phil Knirsch <pknirsch@redhat.com> - 0.1.7-1
+- Added first version CPU tuning and monitoring plugins
+
+* Thu Jun 25 2009 Petr Lautrbach <plautrba@redhat.com> - 0.1.6-1
+- added scomes
 
 * Wed Mar 25 2009 Phil Knirsch <pknirsch@redhat.com> - 0.1.5-1
 - Updated documentation, thanks to Marcela Maslanova!