diff --git a/nfs-kernel-server.tmpfiles.conf b/nfs-kernel-server.tmpfiles.conf
new file mode 100644
index 0000000..275351b
--- /dev/null
+++ b/nfs-kernel-server.tmpfiles.conf
@@ -0,0 +1,5 @@
+# See tmpfiles.d(5) for details
+#Type Path        Mode UID  GID  Age Argument
+d /var/lib/nfs
+f /var/lib/nfs/etab
+f /var/lib/nfs/rmtab
diff --git a/nfs-utils.changes b/nfs-utils.changes
index b9d54c3..ea61369 100644
--- a/nfs-utils.changes
+++ b/nfs-utils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jul  6 15:02:49 CEST 2018 - kukuk@suse.de
+
+- Create files in /var/lib/nfs via tmpfiles.d [bsc#1100404],
+  [FATE#325524]
+
 -------------------------------------------------------------------
 Thu Nov 23 13:40:51 UTC 2017 - rbrown@suse.com
 
diff --git a/nfs-utils.spec b/nfs-utils.spec
index 7114d2a..5a0f8c1 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package nfs-utils
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -25,7 +25,7 @@ Name:           nfs-utils
 Version:        2.1.1
 Release:        0
 Summary:        Support Utilities for Kernel nfsd
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          Productivity/Networking/NFS
 Url:            http://kernel.org/pub/linux/utils/nfs-utils/
 Source0:        http://kernel.org/pub/linux/utils/nfs-utils/%{version}/nfs-utils-%{version}.tar.xz
@@ -49,6 +49,7 @@ Source23:       rpc-statd.options.conf
 Source24:       rpc-statd-notify.options.conf
 Source25:       rpc-svcgssd.options.conf
 Source26:       nfs.conf
+Source27:       nfs-kernel-server.tmpfiles.conf
 Patch0:         nfs-utils-1.0.7-bind-syntax.patch
 Patch1:         0001-conffile-ignore-empty-environment-variables.patch
 Patch2:         0002-mount-call-setgroups-before-setuid.patch
@@ -170,6 +171,7 @@ install -D -m 644 %{SOURCE23} %{buildroot}%{_unitdir}/rpc-statd.service.d/option
 install -D -m 644 %{SOURCE24} %{buildroot}%{_unitdir}/rpc-statd-notify.service.d/options.conf
 install -D -m 644 %{SOURCE25} %{buildroot}%{_unitdir}/rpc-svcgssd.service.d/options.conf
 install -D -m 644 %{SOURCE26} %{buildroot}%{_sysconfdir}/nfs.conf
+install -D -m 644 %{SOURCE27} %{buildroot}%{_prefix}/lib/tmpfiles.d/nfs-kernel-server.conf
 ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcnfsserver
 ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcnfs-server
 ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcnfs
@@ -244,6 +246,7 @@ if [ -f %{_localstatedir}/lock/subsys/nfsserver-rpc.idmapd ]; then
 fi
 ###
 %service_add_post nfsserver.service nfs-mountd.service nfs-server.service
+%tmpfiles_create nfs-kernel-server.conf
 %set_permissions /var/lib/nfs/rmtab
 
 %postun -n nfs-kernel-server
@@ -343,6 +346,7 @@ fi
 %{_unitdir}/proc-fs-nfsd.mount
 %{_unitdir}/nfsserver.service
 %{_unitdir}/nfs-server.service.d/nfsserver.conf
+%{_prefix}/lib/tmpfiles.d/nfs-kernel-server.conf
 %{_sbindir}/exportfs
 %{_sbindir}/rcnfsserver
 %{_sbindir}/rcnfs-server