diff --git a/binutils/PKGBUILD b/binutils/PKGBUILD
index 94a0dd554..67786d3b8 100644
--- a/binutils/PKGBUILD
+++ b/binutils/PKGBUILD
@@ -6,60 +6,81 @@
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
 
 pkgname=binutils
-pkgver=2.22
+pkgver=2.23
 pkgrel=1
-_date=20120109
-pkgdesc="A set of programs to assemble and manipulate binary and object files."
-arch=('i686' 'x86_64')
+pkgdesc="A set of programs to assemble and manipulate binary and object files"
+arch=('x86_64')
 url="http://www.gnu.org/software/binutils/"
 license=('GPL')
-groups=('base')
+groups=('base-devel')
 depends=('glibc>=2.15' 'zlib')
-checkdepends=('dejagnu')
+checkdepends=('dejagnu' 'bc')
 options=('!libtool' '!distcc' '!ccache')
-install="binutils.install"
-source=("http://chakra.sourceforge.net/sources/${pkgname}/${pkgname}-${pkgver}_${_date}.tar.bz2")
-md5sums=('d6df201cbf66394defc603e1318061fd')
-
-mksource() {
-  export _TAG="binutils-2_22-branch"
-  export CVSROOT=":pserver:anoncvs@sourceware.org:/cvs/src"
-
-  mkdir -p "${pkgname}-${_date}"
-  pushd "${pkgname}-${_date}" >/dev/null
-    cvs -z9 co -r "${_TAG}" binutils && \
-    mv src binutils                  && \
-    tar -cvjf "../binutils-${pkgver}_${_date}.tar.bz2" binutils/*
-  popd >/dev/null
-}
+install=binutils.install
+source=(ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.gz{,.sig})
+md5sums=('ed58f50d8920c3f1d9cb110d5c972c27'
+         '5293d43d444852f71f7c96c6295ba66d')
 
 build() {
-  cd "${srcdir}"
-  mkdir -p binutils-build && cd binutils-build
+  cd ${srcdir}
+  mkdir binutils-build && cd binutils-build
 
-  [ "${CARCH}" == 'x86_64' ] && CONFIGFLAGS=('--enable-64-bit-bfd' '--disable-multilib')
-
-  "${srcdir}/${pkgname}/configure" \
-  	--prefix=/usr \
-  	--enable-ld=default \
-  	--enable-gold \
-  	--enable-lto \
-  	--enable-plugins \
-  	--enable-threads \
-  	--enable-shared \
-	  "${CONFIGFLAGS[@]}"
+  ${srcdir}/binutils-${pkgver}/configure --prefix=/usr \
+    --with-lib-path=/usr/lib:/usr/local/lib \
+    --with-bugurl=http://chakra-linux.org/bugs/ \
+    --enable-ld=default --enable-gold \
+    --enable-plugins --enable-threads --enable-shared \
+    --disable-werror --disable-multilib
 
   # check the host environment and makes sure all the necessary tools are available
   make configure-host
 
-  make tooldir="${pkgdir}/usr"
+  make tooldir=${pkgdir}/usr
+
+  # Rebuild libiberty.a with -fPIC
+  cp -a libiberty libiberty-pic
+  make -C libiberty-pic clean
+  make CFLAGS="$CFLAGS -fPIC" -C libiberty-pic
+
+  # Rebuild libbfd.a with -fPIC
+  # hidden visability prevent 3rd party shared libraries exporting bfd non-stable API
+  cp -a bfd bfd-pic
+  make -C bfd-pic clean
+  make CFLAGS="$CFLAGS -fPIC -fvisibility=hidden" -C bfd-pic
+
+  # Rebuild libopcodes.a with -fPIC
+  cp -a opcodes opcodes-pic
+  make -C opcodes-pic clean
+  make CFLAGS="$CFLAGS -fPIC" -C opcodes-pic
+}
+
+check() {
+  cd ${srcdir}/binutils-build
+
+  # unset LDFLAGS as testsuite makes assumptions about which ones are active
+  # do not abort on errors - manually check log files
+  make LDFLAGS="" -k check || true
 }
 
 package() {
-  cd "${srcdir}/binutils-build"
-  make prefix="${pkgdir}/usr" tooldir="${pkgdir}/usr" install
+  cd ${srcdir}/binutils-build
+  make prefix=${pkgdir}/usr tooldir=${pkgdir}/usr install
   
-  # Remove Windows/Novell specific man pages
-  rm -f "${pkgdir}/usr/share/man/man1"/{dlltool,nlmconv,windres,windmc}*
-}
+  # Add some useful headers
+  install -m644 ${srcdir}/binutils-${pkgver}/include/libiberty.h ${pkgdir}/usr/include
+  install -m644 ${srcdir}/binutils-${pkgver}/include/demangle.h ${pkgdir}/usr/include
 
+  # install libraries rebuilt with -fPIC
+  install -m644 libiberty-pic/libiberty.a ${pkgdir}/usr/lib
+  install -m644 bfd-pic/libbfd.a ${pkgdir}/usr/lib
+  install -m644 opcodes/libopcodes.a ${pkgdir}/usr/lib
+
+  # Remove Windows/Novell specific man pages
+  rm ${pkgdir}/usr/share/man/man1/{dlltool,nlmconv,windres,windmc}*
+
+  # Remove these symlinks, they are not ABI stable.
+  # Programs should compile static to the .a file.
+  rm ${pkgdir}/usr/lib/lib{bfd,opcodes}.so
+  echo "INPUT ( /usr/lib/libbfd.a -liberty -lz )" >${pkgdir}/usr/lib/libbfd.so
+  echo "INPUT ( /usr/lib/libopcodes.a -lbfd )" >${pkgdir}/usr/lib/libopcodes.so
+}