diff --git a/SOURCES/radvd-tmpfs.conf b/SOURCES/radvd-tmpfs.conf
deleted file mode 100644
index 590652c..0000000
--- a/SOURCES/radvd-tmpfs.conf
+++ /dev/null
@@ -1 +0,0 @@
-d	/var/run/radvd	0755 radvd radvd
diff --git a/SOURCES/radvd_tmpfiles.patch b/SOURCES/radvd_tmpfiles.patch
new file mode 100644
index 0000000..0d1307a
--- /dev/null
+++ b/SOURCES/radvd_tmpfiles.patch
@@ -0,0 +1,18 @@
+From 30198b37dd9d8cb3b15c90663145d06e2531d87f Mon Sep 17 00:00:00 2001
+From: Pavel Zhukov <pzhukov@redhat.com>
+Date: Tue, 26 Feb 2019 14:37:16 +0100
+Subject: [PATCH] packaging: Change location of tmpfiles to /run to avoid
+ warnings
+
+Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1678147
+---
+ redhat/systemd/radvd-tmpfs.conf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/redhat/systemd/radvd-tmpfs.conf b/redhat/systemd/radvd-tmpfs.conf
+index 590652c..26f203d 100644
+--- a/redhat/radvd-tmpfs.conf
++++ b/redhat/radvd-tmpfs.conf
+@@ -1 +1 @@
+-d	/var/run/radvd	0755 radvd radvd
++d	/run/radvd	0755 radvd radvd
diff --git a/SPECS/radvd.spec b/SPECS/radvd.spec
index 71add86..e553c4c 100644
--- a/SPECS/radvd.spec
+++ b/SPECS/radvd.spec
@@ -1,14 +1,13 @@
 Summary: A Router Advertisement daemon
 Name: radvd
 Version: 2.17
-Release: 12%{?dist}
+Release: 14%{?dist}
 # The code includes the advertising clause, so it's GPL-incompatible
 License: BSD with advertising
 Group: System Environment/Daemons
 URL: http://www.litech.org/radvd/
 Source0: %{url}dist/%{name}-%{version}.tar.xz
-Source1: radvd-tmpfs.conf
-Source2: radvd.service
+Source1: radvd.service
 
 BuildRequires: gcc
 BuildRequires: bison
@@ -21,6 +20,7 @@ BuildRequires: systemd
 Requires(pre): shadow-utils
 
 Patch0: radvd_add_ra_memleak.patch
+Patch1: radvd_tmpfiles.patch
 
 %description
 radvd is the router advertisement daemon for IPv6.  It listens to router
@@ -34,7 +34,7 @@ Install radvd if you are setting up IPv6 network and/or Mobile IPv6
 services.
 
 %prep
-%autosetup 
+%autosetup  -p1
 
 for F in CHANGES; do
     iconv -f iso-8859-1 -t utf-8 < "$F" > "${F}.new"
@@ -61,8 +61,8 @@ install -m 644 redhat/radvd.conf.empty %{buildroot}%{_sysconfdir}/radvd.conf
 install -m 644 redhat/radvd.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/radvd
 
 install -d -m 755 %{buildroot}%{_tmpfilesdir}
-install -p -m 644 %{SOURCE1} %{buildroot}%{_tmpfilesdir}/radvd.conf
-install -m 644 %{SOURCE2} %{buildroot}%{_unitdir}
+install -p -m 644 redhat/radvd-tmpfs.conf  %{buildroot}%{_tmpfilesdir}/radvd.conf
+install -m 644 %{SOURCE1} %{buildroot}%{_unitdir}
 
 %check
 # The tests don't work, see https://github.com/reubenhwk/radvd/issues/30
@@ -97,6 +97,10 @@ exit 0
 %{_sbindir}/radvdump
 
 %changelog
+* Fri Oct 25 2019 Pavel Zhukov <pzhukov@redhat.com> - 2.17-14
+- Resolves: #1710787 - Change location of tmpfiles
+- Use tmpfile config from tarball
+
 * Tue Dec  4 2018 Pavel Zhukov <pzhukov@redhat.com> - 2.17-12
 - Resolves: #1652459 - Wait for all devices to be initialized