diff --git a/.gitignore b/.gitignore
index 0966bfe..eb7b67f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /tuned-0.2.21.tar.bz2
+/tuned-0.2.22.tar.bz2
diff --git a/sources b/sources
index d553d79..b16401c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7f3bbae68097f80906d1ee204a52ee24  tuned-0.2.21.tar.bz2
+8b9efeb2a8c46b574a98f3673a275ede  tuned-0.2.22.tar.bz2
diff --git a/tuned.spec b/tuned.spec
index d7bb180..66f4692 100644
--- a/tuned.spec
+++ b/tuned.spec
@@ -1,9 +1,9 @@
-%global uses_tmpfs (0%{?fedora} >= 15)
+%global uses_systemd (0%{?fedora} >= 15)
 
 Summary: A dynamic adaptive system tuning daemon
 Name: tuned
-Version: 0.2.21
-Release: 2%{?dist}
+Version: 0.2.22
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 # The source for this package was pulled from upstream git.  Use the
@@ -49,37 +49,41 @@ instead of fewer large ones).
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
-
-%if !%uses_tmpfs
-    rm -rf %{buildroot}%{_sysconfdir}/tmpfiles.d
+%if %uses_systemd
+    make install DESTDIR=%{buildroot} INITSYSTEM=systemd
+%else
+    make install DESTDIR=%{buildroot}
 %endif
 
 %clean
 rm -rf %{buildroot}
 
 %post
-/sbin/chkconfig --add tuned
+%if !%uses_systemd
+    /sbin/chkconfig --add tuned
+%endif
 /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/service tuned stop &>/dev/null
+    /sbin/service ktune stop &>/dev/null
+
+    %if !%uses_systemd
+        /sbin/chkconfig --del tuned
+    %endif
     /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 || :
+    /sbin/service tuned condrestart &>/dev/null || :
+    /sbin/service ktune condrestart &>/dev/null || :
 fi
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING INSTALL NEWS README doc/DESIGN.txt doc/TIPS.txt ktune/README.ktune doc/examples
-%{_initddir}/tuned
 %config(noreplace) %{_sysconfdir}/tuned.conf
 %config(noreplace) %{_sysconfdir}/pam.d/tuned-adm
 %config(noreplace) %{_sysconfdir}/security/console.apps/tuned-adm
@@ -94,7 +98,6 @@ fi
 %{_mandir}/man1/tuned-adm.*
 %{_mandir}/man5/tuned.conf.*
 %{_mandir}/man8/tuned.*
-%attr(0755,root,root) %{_initddir}/ktune
 %config(noreplace) %{_sysconfdir}/sysconfig/ktune
 %config(noreplace) %{_sysconfdir}/ktune.d/tunedadm.conf
 %dir %{_sysconfdir}/ktune.d
@@ -102,8 +105,15 @@ fi
 %dir %{_localstatedir}/run/tuned
 %attr(0755,root,root) /lib/udev/tuned-mpath-iosched
 /lib/udev/rules.d/*
-%if %uses_tmpfs
+%{_libexecdir}/tuned/
+%if %uses_systemd
 %{_sysconfdir}/tmpfiles.d
+%{_unitdir}/tuned.service
+# compatibility
+%{_initddir}/ktune
+%else
+%{_initddir}/tuned
+%{_initddir}/ktune
 %endif
 
 %files utils
@@ -122,8 +132,24 @@ fi
 
 
 %changelog
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.21-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+* Tue Mar 20 2012 Jan Vcelak <jvcelak@redhat.com> 0.2.22-1
+- fix: daemonization race with systemd
+- enhancement: add pmqos-static daemon (used by ktune to set kernel PM QoS parameters)
+- fix: handle IOError in net plugin
+- enhancement: add support for radeon power savings
+- enhancement: better formula for calculation scomes scores
+- enhancement: better disks detection mechanism
+- enhancement: support for disk scheduler quantum setting
+- enhancement: diskdevstat, netdevstat cmdline error handling
+- tuned-adm:
+  + fix: enabling services compatibly with systemd and sysvinit
+  + fix: crash when active-profile file is missing
+  + enhancement: sort list of profiles
+- profile changes:
+  + latency-performance: add cpu_dma_latency=0
+  + all: add virtual disks (vd*) to ktune.sysconfig
+  + new profile: virtual-host
+  + new profile: virtual-guest
 
 * Tue Jun 21 2011 Jan Vcelak <jvcelak@redhat.com> 0.2.21-1
 - fix: crash when ethtool advertised modes in unknown format (#689715)