diff --git a/systemtap.changes b/systemtap.changes
index 1d0e43a..953192c 100644
--- a/systemtap.changes
+++ b/systemtap.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat May 17 19:34:40 UTC 2014 - coolo@suse.com
+
+- use %_rundir if available
+
 -------------------------------------------------------------------
 Fri May  2 19:48:19 UTC 2014 - tonyj@suse.com
 
diff --git a/systemtap.spec b/systemtap.spec
index e3a319c..eb4bd74 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -42,6 +42,10 @@ Requires:       %{name}-runtime = %{version}-%{release}
 Requires:       libebl1
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
+%if ! %{defined _rundir}
+%define _rundir %{_localstatedir}/run
+%endif
+
 %description
 SystemTap is an instrumentation system for systems running Linux.
 Developers can write instrumentation to collect data on the operation
@@ -154,7 +158,7 @@ systemd-tmpfiles --create /usr/lib/tmpfiles.d/stap-server.conf
 %{_libexecdir}/%{name}/stap-stop-server
 %{_mandir}/man8/stap-server.8*
 %ghost %{_localstatedir}/log/stap-server.log
-%ghost %dir %{_localstatedir}/run/stap-server
+%ghost %dir %{_rundir}/stap-server
 
 %files sdt-devel
 %defattr(-,root,root)