diff --git a/gutenprint.spec b/gutenprint.spec
index 16867ae..30b5976 100644
--- a/gutenprint.spec
+++ b/gutenprint.spec
@@ -2,13 +2,15 @@
 %define cups_serverbin %{_exec_prefix}/lib/cups
 
 Name:           gutenprint
-Summary:        Printer Drivers Package.
+Summary:        Printer Drivers Package
 Version:        5.2.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Group:          System Environment/Base
 URL:            http://gimp-print.sourceforge.net/
 Source0:        http://dl.sf.net/gimp-print/gutenprint-%{version}.tar.bz2
+# Post-install script to update foomatic PPDs.
 Source1:        gutenprint-foomaticppdupdate
+# Post-install script to update CUPS native PPDs.
 Source2:        cups-genppdupdate.py.in
 Patch0:         gutenprint-menu.patch
 Patch1:         gutenprint-O6.patch
@@ -43,8 +45,8 @@ Solaris, IRIX, and other UNIX-alike operating systems.
 Gutenprint was formerly called Gimp-Print.
 
 %package doc
-Summary:	Documentation for gutenprint
-Group:		Documentation
+Summary:        Documentation for gutenprint
+Group:          Documentation
 
 %description doc
 Documentation for gutenprint.
@@ -76,9 +78,9 @@ This package contains the gutenprint GIMP plug-in.
 Summary:        Foomatic printer database information for gutenprint
 Group:          System Environment/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires(post):	foomatic
-Requires(post):	system-config-printer-libs
-Requires:	foomatic-db
+Requires(post): foomatic
+Requires(post): system-config-printer-libs
+Requires:       foomatic-db
 Obsoletes: gimp-print <= 4.2.7-25
 Provides: gimp-print = 4.2.7-25
 
@@ -141,10 +143,15 @@ Epson, HP and compatible printers.
 
 %prep
 %setup -q -n %{name}-%{version}
+# Fix menu placement of GIMP plugin.
 %patch0 -p1 -b .menu
+# Don't use -O6 compiler option.
 %patch1 -p1 -b .O6
+# Restore file contexts when updating PPDs.
 %patch2 -p1 -b .selinux
+# Don't claim support for Brother HL-2040.
 %patch3 -p1 -b .brother-hl-2040
+# Allow the CUPS dynamic driver to run inside a build root.
 %patch4 -p1 -b .postscriptdriver
 
 cp %{SOURCE2} src/cups/cups-genppdupdate.in
@@ -154,9 +161,9 @@ cp %{SOURCE2} src/cups/cups-genppdupdate.in
             --with-foomatic --with-ghostscript \
             --enable-samples --enable-escputil \
             --enable-test --disable-rpath \
-	    --enable-cups-1_2-enhancements \
-	    --disable-cups-ppds \
-	    --enable-simplified-cups-ppds
+            --enable-cups-1_2-enhancements \
+            --disable-cups-ppds \
+            --enable-simplified-cups-ppds
 
 make %{?_smp_mflags}
  
@@ -236,25 +243,26 @@ exit 0
 %exclude %{_libdir}/*.la
 
 %files plugin
+%defattr(-, root, root,-)
 %{_libdir}/gimp/*/plug-ins/gutenprint
 
 %files foomatic
-%doc 
 %defattr(-, root, root,-)
+%doc 
 %{_sbindir}/gutenprint-foomaticppdupdate
 %{_datadir}/foomatic/kitload.log
 %{_datadir}/foomatic/db/source/driver/*
 %{_datadir}/foomatic/db/source/opt/*
 
 %files extras
-%doc
 %defattr(-, root, root,-)
+%doc
 %{_bindir}/testpattern
 %{_datadir}/gutenprint/samples/*
 
 %files cups
-%doc
 %defattr(-, root, root,-)
+%doc
 %{_datadir}/cups/calibrate.ppm
 %{cups_serverbin}/filter/*
 %{cups_serverbin}/driver/*
@@ -273,6 +281,12 @@ fi
 /bin/rm -f /var/cache/foomatic/*
 
 %changelog
+* Tue Mar  2 2010 Tim Waugh <twaugh@redhat.com> 5.2.5-4
+- Better defattr use in file manifests.
+- Fixed mixed spaces and tabs.
+- Fixed main package summary.
+- Added comments for all sources and patches.
+
 * Mon Feb 15 2010 Tim Waugh <twaugh@redhat.com> 5.2.5-3
 - The cups sub-package requires the exactly-matching main gutenprint
   package.