diff --git a/cyphesis.spec b/cyphesis.spec
index aeafffd..979e62b 100644
--- a/cyphesis.spec
+++ b/cyphesis.spec
@@ -18,6 +18,7 @@ Source8:        cyphesis-tmpfiles.conf
 Patch0:         cyphesis-0.5.19-init.patch
 Patch1:         cyphesis-0.5.11-logdir.patch
 Patch5:         cyphesis-0.5.21-dso-linking.patch
+Patch7:         cyphesis-socketdir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  python-devel libgcrypt-devel pkgconfig atlascpp-devel
 BuildRequires:  varconf-devel libsigc++20-devel mercator-devel skstream-devel
@@ -54,6 +55,7 @@ Logwatch scripts for the WorldForge game server.
 %patch0 -p1
 %patch1 -p0
 %patch5 -p1 -b .dso.linking
+%patch7 -p0
 
 chmod a-x rulesets/basic/mind/dictlist.py
 chmod a-x rulesets/mason/world/objects/buildings/House.py
@@ -79,7 +81,9 @@ autoreconf -i
 make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
+# Work around makefile issue
+mkdir -p %{buildroot}%{_var}/run/%{name}
+
 make install DESTDIR=%{buildroot}
 
 install -d %{buildroot}%{_sysconfdir}/init.d