diff --git a/dnsmasq.service b/dnsmasq.service
index 07fa92e..f7ec15b 100644
--- a/dnsmasq.service
+++ b/dnsmasq.service
@@ -3,7 +3,9 @@ Description=DNS caching server.
 After=network.target
 
 [Service]
-ExecStart=/usr/sbin/dnsmasq -k
+ExecStart=/usr/sbin/dnsmasq --pid-file=/run/dnsmasq.pid
+Type=forking
+PIDFile=/run/dnsmasq.pid
 
 [Install]
 WantedBy=multi-user.target
diff --git a/dnsmasq.spec b/dnsmasq.spec
index 008b841..20be34f 100644
--- a/dnsmasq.spec
+++ b/dnsmasq.spec
@@ -183,6 +183,7 @@ install -Dpm 644 %{SOURCE2} %{buildroot}%{_sysusersdir}/%{name}.conf
 %changelog
 * Wed Mar 31 2021 Petr Menšík <pemensik@redhat.com> - 2.85-1.rc2
 - Update to 2.85rc2 (CVE-2021-3448)
+- Switch systemd unit to forking, reports error on startup (#1774028)
 
 * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.84-2
 - Rebuilt for updated systemd-rpm-macros