diff --git a/pptp.spec b/pptp.spec
index f680d04..7a01b2e 100644
--- a/pptp.spec
+++ b/pptp.spec
@@ -1,19 +1,17 @@
-Name:           pptp
-Version:        1.7.1
-Release:        2%{?dist}
-Summary:        Point-to-Point Tunneling Protocol (PPTP) Client
-
-Group:          Applications/Internet
-License:        GPL
-URL:            http://pptpclient.sourceforge.net/
-Source0:        http://dl.sf.net/pptpclient/pptp-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Requires:       ppp >= 2.4.2
+Name:		pptp
+Version:	1.7.1
+Release:	3%{?dist}
+Summary:	Point-to-Point Tunneling Protocol (PPTP) Client
+Group:		Applications/Internet
+License:	GPLv2+
+URL:		http://pptpclient.sourceforge.net/
+Source0:	http://downloads.sf.net/pptpclient/pptp-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires:	ppp >= 2.4.2
 
 %description
 Client for the proprietary Microsoft Point-to-Point Tunneling
-Protocol, PPTP.  Allows connection to a PPTP based VPN as used
+Protocol, PPTP.	 Allows connection to a PPTP based VPN as used
 by employers and some cable and ADSL service providers.
 
 %prep
@@ -32,17 +30,22 @@ by employers and some cable and ADSL service providers.
 %{__rm} -rf %{buildroot}
 
 %files
-%defattr(-,root,root,0755)
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING DEVELOPERS NEWS README TODO USING
 %doc ChangeLog Documentation/DESIGN.PPTP PROTOCOL-SECURITY
 %{_sbindir}/pptp
 %{_mandir}/man8/pptp.8*
-%dir %attr(750,root,root) %{_localstatedir}/run/pptp
+%dir %attr(750,root,root) %{_localstatedir}/run/pptp/
 # /etc/ppp is hardcoded instead of using %{_sysconfdir}/ppp because the
 # Fedora Core ppp package hardcodes the directory name
 %config(noreplace) /etc/ppp/options.pptp
 
 %changelog
+* Fri Aug 24 2007 Paul Howarth <paul@city-fan.org> 1.7.1-3
+- Change download URL from df.sf.net to downloads.sf.net
+- Expand tabs in spec
+- Clarify license as GPL version 2 or later
+
 * Wed Aug 30 2006 Paul Howarth <paul@city-fan.org> 1.7.1-2
 - FE6 mass rebuild
 
@@ -52,7 +55,7 @@ by employers and some cable and ADSL service providers.
 - cosmetic change: replace variables with macros
 
 * Wed Aug 10 2005 Paul Howarth <paul@city-fan.org> 1.7.0-2
-- own directory %{_localstatedir}/run/pptp
+- own directory %%{_localstatedir}/run/pptp
 
 * Thu Jul 28 2005 Paul Howarth <paul@city-fan.org> 1.7.0-1
 - new upstream version 1.7.0
@@ -75,7 +78,7 @@ by employers and some cable and ADSL service providers.
 - Weed out documentation useful only to developers
 - Add dist tag
 - Use full URL for SOURCE0
-- Fix permissions on %{_sbindir}/pptp
+- Fix permissions on %%{_sbindir}/pptp
 
 * Fri May  6 2005 Paul Howarth <paul@city-fan.org> 1.6.0-1
 - First build for Fedora Extras, based on upstream spec file