diff --git a/hostapd.service b/hostapd.service
index ce5f8a7..111926f 100644
--- a/hostapd.service
+++ b/hostapd.service
@@ -4,8 +4,8 @@ After=network.target
 
 [Service]
 Type=forking
-PIDFile=/run/hostapd.pid
-ExecStart=/usr/sbin/hostapd /etc/hostapd.conf -P /run/hostapd.pid -B
+PIDFile=/run/hostapd/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 f1791a6..6d9da87 100644
--- a/hostapd.spec
+++ b/hostapd.spec
@@ -1,6 +1,6 @@
 Name:           hostapd
 Version:        0.7.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator
 Group:          System Environment/Daemons
 License:        BSD
@@ -77,7 +77,7 @@ install -pm 0755 hostapd/logwatch/hostapd \
 
 # config files
 install -d %{buildroot}/%{_sysconfdir}/%{name}
-install -pm 0644 hostapd.conf %{buildroot}/%{_sysconfdir}/%{name}/hostapd.conf
+install -pm 0600 hostapd.conf %{buildroot}/%{_sysconfdir}/%{name}/hostapd.conf
 
 install -d %{buildroot}/%{_sysconfdir}/sysconfig
 install -pm 0644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig/hostapd
@@ -166,6 +166,10 @@ fi
 
 
 %changelog
+* Fri May 25 2012 John W. Linville <linville@redhat.com> - 0.7.3-6
+- Fixup typo in configuration file path in hostapd.service
+- Tighten-up default permissions for hostapd.conf
+
 * Tue Feb 28 2012 Jon Ciesla <limburgher@gmail.com> - 0.7.3-5
 - Migrate to systemd, BZ 770310.