diff --git a/.gitignore b/.gitignore
index 24f9872..a67bfd6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/mpir-2.5.2.tar.bz2
+/mpir-2.6.0.tar.lzma
diff --git a/mpir.spec b/mpir.spec
index 7400c4e..f93fed1 100644
--- a/mpir.spec
+++ b/mpir.spec
@@ -1,12 +1,12 @@
 Name:			mpir
-Version:		2.5.2
+Version:		2.6.0
 Release:		1%{?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.bz2
+Source0:		http://www.mpir.org/%{name}-%{version}.tar.lzma
 
 ExcludeArch:		s390 s390x
 
@@ -37,7 +37,7 @@ for fil in AUTHORS NEWS; do
 done
 
 # Convert Windows-style line endings to Unix-style
-for fil in doc/devel/*.txt doc/devel/configuration doc/isa_abi_headache; do
+for fil in doc/devel/* doc/isa_abi_headache; do
   sed 's/\r//' $fil > $fil.conv
   touch -r $fil $fil.conv
   mv -f $fil.conv $fil
@@ -47,7 +47,7 @@ done
 %configure --disable-static --enable-cxx \
   CCAS="gcc -c -Wa,--noexecstack" \
   LIBS="-lrt" \
-  LDFLAGS="$RPM_LD_FLAGS -Wl,-z,noexecstack"
+  LDFLAGS="$RPM_LD_FLAGS -Wl,--as-needed -Wl,-z,noexecstack"
 
 # Remove YASM, just use the system yasm
 rm -rf yasm/*
@@ -58,12 +58,12 @@ all install check:
 EOT
 
 # Get rid of undesirable hardcoded rpaths; workaround libtool reordering
-# -Wl,--as-needed after all the libraries; also fix a typo.
-sed -e 's/func_apped/func_append/' \
-    -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
+# -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="g++"|CC="g++ -Wl,--as-needed"|' \
+    -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|' \
     -i libtool
 
 # Compile
@@ -73,7 +73,7 @@ make %{?_smp_mflags}
 %install
 make install DESTDIR=%{buildroot}
 find %{buildroot} -name '*.la' -exec rm -f {} ';'
-rm -rf %{buildroot}/usr/share/info/dir
+rm -rf %{buildroot}%{_infodir}/dir
 mv doc/devel doc/html
 
 %check
@@ -103,6 +103,11 @@ fi
 %{_infodir}/mpir.info*
 
 %changelog
+* Fri Nov  9 2012 Jerry James <loganjerry@gmail.com> - 2.6.0-1
+- New upstream release
+- Drop libtool typo fix; fixed upstream
+- Fix libtool workaround for -Wl,--as-needed
+
 * Thu Oct  4 2012 Jerry James <loganjerry@gmail.com> - 2.5.2-1
 - New upstream release
 - Link with -lrt to get the clock_* functions
diff --git a/sources b/sources
index 426111a..caeac30 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b7d7bf24ec9e6c85021ff3c3e010546b  mpir-2.5.2.tar.bz2
+cec318bffabccd4e5a5d2b63389fde0f  mpir-2.6.0.tar.lzma