diff --git a/stap-server.conf b/stap-server.conf
new file mode 100644
index 0000000..7653633
--- /dev/null
+++ b/stap-server.conf
@@ -0,0 +1,2 @@
+# Systemtap-server needs some files in /var/run
+d /var/run/stap-server 0755 root root -
diff --git a/systemtap.changes b/systemtap.changes
index 68ff4f7..f5e22a9 100644
--- a/systemtap.changes
+++ b/systemtap.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Aug 19 08:38:29 UTC 2011 - tonyj@novell.com
+
+- Fix for Bug 710291 - systemtap: fails rpmlint check non-ghost-in-var-run 
+
 -------------------------------------------------------------------
 Mon May  2 15:11:31 UTC 2011 - idoenmez@novell.com
 
diff --git a/systemtap.spec b/systemtap.spec
index 23a1ee7..cbd49bc 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -36,6 +36,8 @@ Url:            http://sourceware.org/systemtap/
 %define package_version  %{version}
 %endif
 Source:         ftp://sources.redhat.com/pub/systemtap/snapshots/systemtap-%{package_version}.tar.bz2
+Source2:        README-BEFORE-ADDING-PATCHES
+Source3:        stap-server.conf
 # need -docdir patch even though docs are packaged by systemtap-docs.spec
 # so that they are installed into directories matching below rm -rf's
 Patch1:         systemtap-docdir-fix.diff
@@ -122,9 +124,11 @@ rm -rf $RPM_BUILD_ROOT%{_mandir}/man3
 mkdir -p $RPM_BUILD_ROOT%{_docdir}/systemtap/
 cp COPYING $RPM_BUILD_ROOT%{_docdir}/systemtap/
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/systemtap
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/systemtap
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log
 touch $RPM_BUILD_ROOT%{_localstatedir}/log/stap-server.log
+# config file for stap-server (/var/run now on tmpfs)
+mkdir -p $RPM_BUILD_ROOT/usr/lib/tmpfiles.d
+install -m 644 %SOURCE3 $RPM_BUILD_ROOT/usr/lib/tmpfiles.d
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -139,7 +143,6 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_datadir}/%{name}/tapset
 #packaged by systemtap-initscript in upstream
 %dir %{_localstatedir}/cache/systemtap
-%dir %{_localstatedir}/run/systemtap
 
 %files runtime
 %defattr(-,root,root)
@@ -167,6 +170,8 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %files server
 %defattr(-,root,root)
+%dir /usr/lib/tmpfiles.d
+/usr/lib/tmpfiles.d/stap-server.conf
 %{_bindir}/stap-authorize-server-cert
 %{_bindir}/stap-server
 %{_libexecdir}/%{name}/stap-serverd
@@ -180,6 +185,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man8/stap-server.8*
 %{_mandir}/man8/stap-authorize-server-cert.8*
 %ghost %{_localstatedir}/log/stap-server.log
+%ghost %dir %{_localstatedir}/run/stap-server
 
 %files sdt-devel
 %defattr(-,root,root)