diff --git a/mpir.spec b/mpir.spec
index 09a79b4..08f140f 100644
--- a/mpir.spec
+++ b/mpir.spec
@@ -1,12 +1,12 @@
 Name:			mpir
 Version:		2.6.0
-Release:		8%{?dist}
+Release:		9%{?dist}
 Summary:		A library for arbitrary precision arithmetic
 
 Group:			System Environment/Libraries
 License:		LGPLv3+
-URL:			http://www.mpir.org/
-Source0:		http://www.mpir.org/%{name}-%{version}.tar.lzma
+URL:			http://mpir.org/
+Source0:		http://mpir.org/%{name}-%{version}.tar.lzma
 # Sent upstream 4 Jan 2013.  Fix a broken test.
 Patch0:			%{name}-test.patch
 # Enable aarch64 support
@@ -47,10 +47,6 @@ for fil in doc/devel/* doc/isa_abi_headache; do
   mv -f $fil.conv $fil
 done
 
-# Workaround for http://sourceware.org/bugzilla/show_bug.cgi?id=14887
-# Remove this once Fedora binutils has a patch for the problem.
-sed -i 's/\[[[:blank:]]\(.*\)[[:blank:]]\]/[\1]/' mpn/arm/udiv.asm
-
 %build
 %configure --disable-static --enable-cxx \
   CCAS="gcc -c -Wa,--noexecstack" \
@@ -69,9 +65,7 @@ EOT
 # -Wl,--as-needed after all the libraries.
 sed -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
     -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \
-    -e 's|^LTCC="gcc|LTCC="gcc -Wl,--as-needed|' \
-    -e 's|^CC="gcc|CC="gcc -Wl,--as-needed|' \
-    -e 's|^CC="g++|CC="g++ -Wl,--as-needed|' \
+    -e 's|CC="\(g.*\)"|CC="\1 -Wl,--as-needed"|' \
     -i libtool
 
 # Compile
@@ -101,7 +95,8 @@ if [ $1 = 0 ] ; then
 fi
 
 %files
-%doc AUTHORS COPYING COPYING.LIB NEWS README
+%doc AUTHORS NEWS README
+%license COPYING COPYING.LIB
 %{_libdir}/*.so.*
 
 %files devel
@@ -111,6 +106,12 @@ fi
 %{_infodir}/mpir.info*
 
 %changelog
+* Sat Feb 21 2015 Jerry James <loganjerry@gmail.com> - 2.6.0-9
+- Update URLs
+- Use license macro
+- Drop workaround for binutils bug, fixed in 2.24
+- Combine libtool workarounds for -Wl,--as-needed
+
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.6.0-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild