diff --git a/hostapd.service b/hostapd.service
index 3409d24..5df5d6f 100644
--- a/hostapd.service
+++ b/hostapd.service
@@ -4,8 +4,8 @@ After=network.target
 
 [Service]
 Type=forking
-PIDFile=/run/hostapd/hostapd.pid
-ExecStart=/usr/sbin/hostapd /etc/hostapd/hostapd.conf -P /run/hostapd/hostapd.pid -B
+PIDFile=/run/hostapd.pid
+ExecStart=/usr/sbin/hostapd /etc/hostapd/hostapd.conf -P /run/hostapd.pid -B
 
 [Install]
 WantedBy=multi-user.target
diff --git a/hostapd.spec b/hostapd.spec
index 46bfd54..ccd954b 100644
--- a/hostapd.spec
+++ b/hostapd.spec
@@ -1,6 +1,6 @@
 Name:           hostapd
 Version:        0.7.3
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator
 Group:          System Environment/Daemons
 License:        BSD
@@ -88,9 +88,6 @@ install -d %{buildroot}/%{_sbindir}
 install -pm 0755 hostapd/hostapd %{buildroot}%{_sbindir}/hostapd
 install -pm 0755 hostapd/hostapd_cli %{buildroot}%{_sbindir}/hostapd_cli
 
-# runtime state directory
-install -d %{buildroot}/%{_localstatedir}/run/%{name}
-
 # man pages
 install -d %{buildroot}%{_mandir}/man{1,8}
 install -pm 0644 hostapd/hostapd_cli.1 %{buildroot}%{_mandir}/man1
@@ -119,7 +116,6 @@ rm -rf %{buildroot}
 %{_sbindir}/hostapd
 %{_sbindir}/hostapd_cli
 %dir %{_sysconfdir}/%{name}
-%ghost %{_localstatedir}/run/%{name}
 %{_mandir}/man1/*
 %{_mandir}/man8/*
 
@@ -167,6 +163,9 @@ fi
 
 
 %changelog
+* Fri Jun  8 2012 John W. Linville <linville@redhat.com> - 0.7.3-9
+- Remove hostapd-specific runtime state directory
+
 * Wed Jun  6 2012 John W. Linville <linville@redhat.com> - 0.7.3-8
 - Fixup typo in pid file path in hostapd.service