diff --git a/ejabberd.spec b/ejabberd.spec
index fd1254b..083724e 100644
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -11,7 +11,7 @@
 
 Name:           ejabberd
 Version:        2.1.8
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -181,6 +181,12 @@ chmod 755 %{buildroot}%{_sbindir}/ejabberdctl
 # for this *default* sript, which is not intended to be changed
 chmod 755 %{buildroot}%{_libdir}/%{name}/priv/bin/captcha.sh
 
+%if 0%{?fc15}%{?fc16}
+# create /etc/tmpfiles.d entry
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d
+echo "d /var/lock/ejabberdctl 0750 ejabberd ejabberd" > $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/%{name}.conf
+%endif
+
 %pre
 %{__fe_groupadd} %{uid} -r %{name} &>/dev/null || :
 %{__fe_useradd} %{uid} -r -s /sbin/nologin -d /var/lib/ejabberd -M \
@@ -270,6 +276,10 @@ rm -rf %{buildroot}
 %attr(640,ejabberd,ejabberd) %config(noreplace) %{_sysconfdir}/ejabberd/ejabberdctl.cfg
 %attr(640,ejabberd,ejabberd) %config(noreplace) %{_sysconfdir}/ejabberd/inetrc
 
+%if 0%{?fc15}%{?fc16}
+%{_sysconfdir}/tmpfiles.d/%{name}.conf
+%endif
+
 %{_initrddir}/ejabberd
 %config(noreplace) %{_sysconfdir}/logrotate.d/ejabberd
 %config(noreplace) %{_sysconfdir}/sysconfig/ejabberd
@@ -341,6 +351,9 @@ rm -rf %{buildroot}
 %doc %{_docdir}/%{name}-%{version}/*.txt
 
 %changelog
+* Mon Jul 11 2011 Peter Lemenkov <lemenkov@gmail.com> - 2.1.8-3
+- Fix for systemd (F15+ only, see rhbz #656581)
+
 * Sat Jun 18 2011 Peter Lemenkov <lemenkov@gmail.com> - 2.1.8-2
 - Fix ejabberdctl again