diff --git a/vim.changes b/vim.changes
index afb6955..26a0bd6 100644
--- a/vim.changes
+++ b/vim.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Nov 23 13:05:42 UTC 2011 - aj@suse.de
+
+- Create tmpfiles during install
+- Fix tmpfiles handling
+- Own directory /var/run/vi.recover
+
 -------------------------------------------------------------------
 Tue Nov 22 22:49:39 UTC 2011 - reddwarf@opensuse.org
 
diff --git a/vim.spec b/vim.spec
index f7cc35f..9354029 100644
--- a/vim.spec
+++ b/vim.spec
@@ -37,6 +37,7 @@ BuildRequires:  ruby-devel
 BuildRequires:  tcl-devel
 BuildRequires:  update-alternatives
 BuildRequires:  update-desktop-files
+BuildRequires:  systemd
 #
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version} > 1130
@@ -65,6 +66,7 @@ PreReq:         %{vim_prereq}
 PreReq:         fileutils
 PreReq:         sh-utils
 PreReq:         update-alternatives
+Requires(post): systemd
 #
 Provides:       vim_client
 Provides:       vi
@@ -456,6 +458,8 @@ mv %{buildroot}%{_mandir}/ru.UTF-8 %{buildroot}%{_mandir}/ru
 rm -f %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/tools/*.c
 rm -f %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/macros/maze/*.c
 #
+# Create ghost files (see vim.conf)
+mkdir -p %{buildroot}/var/run/vi.recover
 
 %if 0%{?suse_version} > 1020
 %fdupes -s %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/lang
@@ -474,6 +478,8 @@ rm -rf %{buildroot}
 %post base
 /usr/sbin/update-alternatives --install \
     /bin/vim        vim  %{_datadir}/vim/current/tools/missing-vim-client    0
+# Create tmpfiles
+/bin/systemd-tmpfiles --create /usr/lib/tmpfiles.d/vim.conf
 
 %post enhanced
 /usr/sbin/update-alternatives --install \
@@ -529,7 +535,8 @@ fi
 %config(noreplace) %{_sysconfdir}/vimrc
 %ghost %{_sysconfdir}/alternatives/vim
 %dir /usr/lib/tmpfiles.d
-%config(noreplace) /usr/lib/tmpfiles.d/vim.conf
+/usr/lib/tmpfiles.d/vim.conf
+%ghost %dir /var/run/vi.recover
 # symlinks
 /bin/vi
 /bin/vim