diff --git a/pcre.spec b/pcre.spec
index 271ca99..57b1344 100644
--- a/pcre.spec
+++ b/pcre.spec
@@ -2,16 +2,15 @@ Name: pcre
 Version: 8.12
 Release: 3%{?dist}
 Summary: Perl-compatible regular expression library
+Group: System Environment/Libraries
+License: BSD
 URL: http://www.pcre.org/
-Source: ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/%{name}-%{version}.tar.bz2
+Source: ftp://ftp.csx.cam.ac.uk/pub/software/programming/%{name}/%{name}-%{version}.tar.bz2
 Patch0: pcre-8.10-multilib.patch
 # In upstream, bugs #675476, #675477
 Patch1: pcre-8.12-manual_typos.patch
 # Refused by upstream, bug #675477
 Patch2: pcre-8.12-refused_spelling_terminated.patch
-License: BSD
-Group: System Environment/Libraries
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 # New libtool to get rid of rpath
 BuildRequires: autoconf, automake, libtool
 
@@ -57,8 +56,6 @@ done
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # libpcre.so.*() needed by grep during system start (bug #41104)
@@ -68,7 +65,7 @@ pushd $RPM_BUILD_ROOT%{_libdir}
 ln -fs ../../%{_lib}/libpcre.so.0 libpcre.so
 popd
 
-# get rid of unneeded *.la files
+# Get rid of unneeded *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 # These are handled by %%doc in %%files
@@ -81,9 +78,6 @@ make check
 
 %postun -p /sbin/ldconfig
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(-,root,root)
 /%{_lib}/*.so.*
@@ -111,6 +105,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Mon May 09 2011 Petr Pisar <ppisar@redhat.com> - 8.12-3
 - Fix typos in manual pages (bugs #675476, #675477)
+- Clean spec file up
 
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 8.12-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild