diff --git a/httpd.service b/httpd.service
index b176a92..307666c 100644
--- a/httpd.service
+++ b/httpd.service
@@ -8,6 +8,12 @@ EnvironmentFile=/etc/sysconfig/httpd
 ExecStart=/usr/sbin/httpd $OPTIONS -DFOREGROUND
 ExecReload=/usr/sbin/httpd $OPTIONS -k graceful
 ExecStop=/usr/sbin/httpd $OPTIONS -k graceful-stop
+# We want systemd to give httpd some time to finish gracefully, but still want
+# it to kill httpd after TimeoutStopSec if something went wrong during the
+# graceful stop. Normally, Systemd sends SIGTERM signal right after the
+# ExecStop, which would kill httpd. We are sending useless SIGCONT here to give
+# httpd time to finish.
+KillSignal=SIGCONT
 PrivateTmp=true
 
 [Install]
diff --git a/httpd.spec b/httpd.spec
index 4a56eda..d952075 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -14,7 +14,7 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.4.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
 Source1: index.html
@@ -604,6 +604,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/rpm/macros.httpd
 
 %changelog
+* Tue Apr 16 2013 Jan Kaluza <jkaluza@redhat.com> - 2.4.4-4
+- fix service file to not send SIGTERM after ExecStop (#906321, #912288)
+
 * Tue Mar 26 2013 Jan Kaluza <jkaluza@redhat.com> - 2.4.4-3
 - protect MIMEMagicFile with IfModule (#893949)