diff --git a/cdparanoia.spec b/cdparanoia.spec
index 7af91aa..cc5d80f 100644
--- a/cdparanoia.spec
+++ b/cdparanoia.spec
@@ -1,9 +1,11 @@
+Summary: A Compact Disc Digital Audio (CDDA) extraction tool (or ripper).
 Name: cdparanoia
 Version: 10.2
 Release: 3%{?dist}
 # the app is GPLv2, everything else is LGPLv2
 License: GPLv2 and LGPLv2
 Group: Applications/Multimedia
+URL: http://www.xiph.org/paranoia/index.html
 Source: http://downloads.xiph.org/releases/%{name}/%{name}-III-%{version}.src.tgz
 # Patch from upstream to fix cdda_interface.h C++ incompatibility ("private")
 # https://trac.xiph.org/changeset/15338
@@ -11,11 +13,9 @@ Source: http://downloads.xiph.org/releases/%{name}/%{name}-III-%{version}.src.tg
 Patch0: cdparanoia-10.2-#463009.patch
 # #466659
 Patch1: cdparanoia-10.2-endian.patch
-Url: http://www.xiph.org/paranoia/index.html
-BuildRoot: %{_tmppath}/cdparanoia-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: cdparanoia-libs = %{version}-%{release}
 Obsoletes: cdparanoia-III
-Summary: A Compact Disc Digital Audio (CDDA) extraction tool (or ripper).
 
 %description 
 Cdparanoia (Paranoia III) reads digital audio directly from a CD, then
@@ -27,22 +27,22 @@ drives prone to misalignment, frame jitter and loss of streaming during
 atomic reads.  Cdparanoia is also good at reading and repairing data from
 damaged CDs.
 
-%package -n cdparanoia-devel
+%package devel
 Summary: Development tools for libcdda_paranoia (Paranoia III).
 Group: Development/Libraries
 Requires: cdparanoia-libs = %{version}-%{release}
 License: LGPLv2
 
-%description -n cdparanoia-devel
+%description devel
 The cdparanoia-devel package contains the static libraries and header
 files needed for developing applications to read CD Digital Audio disks.
 
-%package -n cdparanoia-libs
+%package libs
 Summary: Libraries for libcdda_paranoia (Paranoia III).
 Group: Development/Libraries
 License: LGPLv2
 
-%description -n cdparanoia-libs
+%description libs
 The cdparanoia-libs package contains the dynamic libraries needed for
 applications which read CD Digital Audio disks.
 
@@ -92,22 +92,25 @@ fi
 %clean
 [ "$RPM_BUILD_ROOT" != "/" -a -d "$RPM_BUILD_ROOT" ] && rm -rf "$RPM_BUILD_ROOT"
 
-%files -n cdparanoia
+%files
 %defattr(-,root,root)
 %doc README
 %{_bindir}/*
 %{_mandir}/man1/*
 
-%files -n cdparanoia-libs
+%files libs
 %defattr(-,root,root)
 %{_libdir}/*.so*
 
-%files -n cdparanoia-devel
+%files devel
 %defattr(-,root,root)
 %{_includedir}/cdda
 %{_libdir}/*.a
 
 %changelog
+* Tue Feb 10 2009 Adam Jackson <ajax@redhat.com>
+- Merge review cleanups (not finished, #225638)
+
 * Tue Feb 10 2009 Adam Jackson <ajax@redhat.com> 10.2-3
 - cdparanoia-10.2-endian.patch: Backport a crash fix for host/drive
   endianness mismatch. (#466659)