diff --git a/.cvsignore b/.cvsignore
index 1574b33..a9c285b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-systemtap-0.2.tar.gz
 elfutils-0.111.tar.gz
+systemtap-0.2.2.tar.gz
diff --git a/sources b/sources
index c836820..d69f07f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 22bf6c073290d0540cf598135f6b9f7d  elfutils-0.111.tar.gz
-a44a14d7195715c70616164ca5118c11  systemtap-0.2.1.tar.gz
+3575739207cb38c5593c291c4d441535  systemtap-0.2.2.tar.gz
diff --git a/systemtap.spec b/systemtap.spec
index 7d47b00..3a1a034 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -2,7 +2,7 @@
 %define elfutils_version 0.111
 
 Name: systemtap
-Version: 0.2.1
+Version: 0.2.2
 Release: 2
 Summary: Instrumentation System
 Group: Development/System
@@ -98,6 +98,8 @@ mkdir -p ${installed_elfutils}
 cp -P lib-elfutils/*.so* lib-elfutils/%{name}/*.so* ${installed_elfutils}/
 %endif
 
+mkdir -p $RPM_BUILD_ROOT/var/cache/systemtap
+
 %check
 make check %{?elfutils_mflags} || :
 
@@ -111,12 +113,14 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %{_bindir}/stap
 %{_mandir}/man1/*
-%{_libexecdir}/systemtap/stpd
+%{_libexecdir}/systemtap/*
 
 %dir %{_datadir}/systemtap
 %{_datadir}/systemtap/runtime
 %{_datadir}/systemtap/tapset
 
+%dir %attr(0755,root,root) /var/cache/systemtap
+
 %if %{bundled_elfutils}
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/lib*.so*
@@ -124,9 +128,13 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
-* Wed Aug  3 2005 Roland McGrath <roland@redhat.com> - 0.2.1-2
+* Thu Aug  4 2005 Roland McGrath <roland@redhat.com> - 0.2.2-2
 - Rebuilt for FC5.
 
+* Wed Aug  3 2005 Martin Hunt <hunt@redhat.com> - 0.2.2-1
+- Add directory /var/cache/systemtap
+- Add stp_check to /usr/libexec/systemtap
+
 * Wed Aug  3 2005 Roland McGrath <roland@redhat.com> - 0.2.1-1
 - New version 0.2.1, various fixes.