diff --git a/cairomm.spec b/cairomm.spec
index 5622f15..f10183f 100644
--- a/cairomm.spec
+++ b/cairomm.spec
@@ -1,5 +1,6 @@
 %global apiver 1.0
 
+# From configure.ac:
 %global cairo_version 1.10.0
 %global libsigc_version 2.5.1
 
@@ -11,7 +12,7 @@ Release:        14%{?dist}
 URL:            http://www.cairographics.org
 License:        LGPLv2+
 
-Source:         http://www.cairographics.org/releases/%{name}-%{version}.tar.gz
+Source0:        http://www.cairographics.org/releases/%{name}-%{version}.tar.gz
 
 BuildRequires:  gcc-c++
 BuildRequires:  make
@@ -26,26 +27,26 @@ BuildRequires:  perl(Getopt::Long)
 Requires:       cairo%{?_isa} >= %{cairo_version}
 Requires:       libsigc++20%{?_isa} >= %{libsigc_version}
 
-%description
+%global common_description %{expand:
 Cairomm is the C++ API for the cairo graphics library. It offers all the power
-of cairo with an interface familiar to C++ developers, including use of the 
-Standard Template Library where it makes sense.
+of cairo with an interface familiar to C++ developers, including use of the
+Standard Template Library where it makes sense.}
+
+%description %{common_description}
 
 
 %package        devel
 Summary:        Headers for developing programs that will use %{name}
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 
-%description    devel
-Cairomm is the C++ API for the cairo graphics library. It offers all the power
-of cairo with an interface familiar to C++ developers, including use of the 
-Standard Template Library where it makes sense.
+%description    devel %{common_description}
+
+This package contains the libraries and header files needed for developing
+%{name} applications.
 
-This package contains the libraries and header files needed for
-developing %{name} applications.
 
 %package        doc
-Summary:        Developer's documentation for the cairomm library
+Summary:        Developer’s documentation for the cairomm library
 BuildArch:      noarch
 Requires:       %{name} = %{version}-%{release}
 Requires:       libsigc++20-doc
@@ -72,7 +73,7 @@ make %{?_smp_mflags}
 
 %install
 %make_install
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+find %{buildroot} -type f -name '*.la' -exec rm -f {} ';'
 
 
 %ldconfig_scriptlets