diff --git a/hostapd.conf b/hostapd.conf
index 3fae6db..c836bc4 100644
--- a/hostapd.conf
+++ b/hostapd.conf
@@ -3,6 +3,11 @@
 # 
 # DO NOT BE SATISFIED WITH THAT!!!
 #
+# A complete, well commented example configuration file is
+# available here:
+#
+#	/usr/share/doc/hostapd-HOSTAPD_VERSION/hostapd.conf
+#
 # For more information, look here:
 #
 #	http://wireless.kernel.org/en/users/Documentation/hostapd
diff --git a/hostapd.spec b/hostapd.spec
index ac31d20..f7aa034 100644
--- a/hostapd.spec
+++ b/hostapd.spec
@@ -1,6 +1,6 @@
 Name:           hostapd
 Version:        0.7.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator
 Group:          System Environment/Daemons
 License:        BSD
@@ -44,6 +44,9 @@ Logwatch scripts for hostapd
 # Hack Makefile to allow use of RPM_OPT_FLAGS
 %patch0 -p1
 
+# Prepare default config file
+cat %{SOURCE2} | sed -e 's/HOSTAPD_VERSION/'%{version}'/' > hostapd.conf
+
 
 %build
 cd hostapd
@@ -72,7 +75,7 @@ install -pm 0755 hostapd/logwatch/hostapd \
 
 # config files
 install -d %{buildroot}/%{_sysconfdir}/%{name}
-install -pm 0644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/%{name}/hostapd.conf
+install -pm 0644 hostapd.conf %{buildroot}/%{_sysconfdir}/%{name}/hostapd.conf
 
 install -d %{buildroot}/%{_sysconfdir}/sysconfig
 install -pm 0644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig/hostapd
@@ -92,6 +95,7 @@ install -pm 0644 hostapd/hostapd.8 %{buildroot}%{_mandir}/man8
 
 # prepare docs
 cp hostapd/README ./README.hostapd
+cp hostapd/README-WPS ./README-WPS.hostapd
 cp hostapd/logwatch/README ./README.logwatch
 
 
@@ -101,7 +105,7 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING README README.hostapd
+%doc COPYING README README.hostapd README-WPS.hostapd
 %doc hostapd/hostapd.conf hostapd/wired.conf
 %doc hostapd/hostapd.accept hostapd/hostapd.deny
 %doc hostapd/hostapd.eap_user hostapd/hostapd.radius_clients
@@ -135,6 +139,10 @@ fi
 
 
 %changelog
+* Wed Jan 18 2012 John W. Linville <linville@redhat.com> - 0.7.3-4
+- Add reference to sample hostapd.conf in the default installed version
+- Include README-WPS from the hostapd distribution as part of the docs
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild