diff --git a/extra/cln/ChangeLog b/extra/cln/ChangeLog
deleted file mode 100644
index 31d56f9c3..000000000
--- a/extra/cln/ChangeLog
+++ /dev/null
@@ -1,6 +0,0 @@
-2009-06-09  Eric Belanger  <eric@archlinux.org>
-
-	* Added info page
-	* Fixed docs location
-	* Added gcc 4.4 patch (close FS#15015)
-	* Added ChangeLog
diff --git a/extra/cln/PKGBUILD b/extra/cln/PKGBUILD
index 65912c91d..91daaadd0 100644
--- a/extra/cln/PKGBUILD
+++ b/extra/cln/PKGBUILD
@@ -1,40 +1,35 @@
-# $Id: PKGBUILD 72798 2010-03-20 03:28:40Z allan $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: Ben <ben@benmazer.net>
+# $Id: PKGBUILD 108622 2011-02-02 01:45:45Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 # PlugApps: Kevin Mihelich <kevin@plugapps.com>
-#  - Added patch to fix compiling on ARM
-#    Source: https://bugzilla.redhat.com/show_bug.cgi?id=517478
-
-plugrel=1
+#  - Redefined our CFLAGS and CXXFLAGS to remove -O2, and define -DNO_ASM.
+#    Optimization kills the builds, NO_ASM prevents it using asm that doesn't work for us.
+#  - Removed building and installing pdf docs, it always fails.
 
 pkgname=cln
-pkgver=1.2.2
-pkgrel=3
+pkgver=1.3.1
+pkgrel=1
 pkgdesc="Class library for numbers"
 arch=('i686' 'x86_64')
 url="http://www.ginac.de/CLN/"
 license=('GPL')
+depends=('gmp')
+makedepends=('texlive-core')
 options=('!libtool')
-depends=('gmp' 'bash' 'texinfo')
 install=cln.install
-source=(ftp://ftpthep.physik.uni-mainz.de/pub/gnu/${pkgname}-${pkgver}.tar.bz2
-        cln-gcc44.patch
-        cln-arm-preprocessor-fix.patch)
-md5sums=('6b479281fec86314b4c7a9357bd83ef8'
-         'aa678ade85c1e364c879b2e0b40ba80d'
-         '9bb1177b2462d071236acc15ba615e76')
-sha1sums=('2d2a5d3e383a3043c5bf68299a466685ef4ec8ec'
-          '6abb412a387ba8d27a6a80f963a55677e431daf8'
-          '5322ed672f623218a7b608e9429e6d7d191b5b75')
+source=(ftp://ftpthep.physik.uni-mainz.de/pub/gnu/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('ede584cb1cafa66d56f42a3cf420469d')
+sha1sums=('351506da9bd7b0b3cefd3a5424823797fb589acc')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 < ../cln-gcc44.patch || return 1
-  patch -p1 -i ${srcdir}/cln-arm-preprocessor-fix.patch || return 1
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" htmldir=/usr/share/doc/cln/html dvidir=/usr/share/doc/cln/dvi install || return 1
-  rm "${pkgdir}/usr/share/info/dir"
-  gzip "${pkgdir}/usr/share/info/cln.info"
+  export CFLAGS="-march=armv5te -pipe -DNO_ASM"
+  export CXXFLAGS="-march=armv5te -pipe -DNO_ASM"
+  ./configure --prefix=/usr
+  make all html
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install install-html
 }
diff --git a/extra/cln/cln-arm-preprocessor-fix.patch b/extra/cln/cln-arm-preprocessor-fix.patch
deleted file mode 100644
index c7e36de2c..000000000
--- a/extra/cln/cln-arm-preprocessor-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -dur cln-1.2.2.backup/src/base/digitseq/cl_asm_arm_.cc cln-1.2.2/src/base/digitseq/cl_asm_arm_.cc
---- cln-1.2.2.backup/src/base/digitseq/cl_asm_arm_.cc	2001-05-25 16:00:18.000000000 -0400
-+++ cln-1.2.2/src/base/digitseq/cl_asm_arm_.cc	2009-08-14 12:23:31.000000000 -0400
-@@ -77,8 +77,8 @@
- #else
- #define DECLARE_FUNCTION(x)
- #endif
--#define GLABEL(x) _##x##:
--#define LABEL(x) x##:
-+#define GLABEL(x) _##x:
-+#define LABEL(x) x:
- #define RRX rrx
- #define END
- 
diff --git a/extra/cln/cln-gcc44.patch b/extra/cln/cln-gcc44.patch
deleted file mode 100644
index 72c2f0e0f..000000000
--- a/extra/cln/cln-gcc44.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- ./src/base/string/input/cl_st_get1.cc~	2000-12-14 11:53:06.000000000 -0500
-+++ ./src/base/string/input/cl_st_get1.cc	2009-06-07 16:36:45.681507023 -0400
-@@ -1,6 +1,7 @@
- // cl_fget().
- 
- // General includes.
-+#include <cstdio>
- #include "cl_sysdep.h"
- 
- // Specification.
---- ./src/base/string/input/cl_st_get2.cc~	2000-12-14 11:53:06.000000000 -0500
-+++ ./src/base/string/input/cl_st_get2.cc	2009-06-07 16:52:15.291008894 -0400
-@@ -1,6 +1,7 @@
- // cl_fget().
- 
- // General includes.
-+#include <cstdio>
- #include "cl_sysdep.h"
- 
- // Specification.
---- ./src/base/string/input/cl_st_getline1.cc~	2000-12-14 11:53:06.000000000 -0500
-+++ ./src/base/string/input/cl_st_getline1.cc	2009-06-08 19:18:18.815843098 -0400
-@@ -1,6 +1,7 @@
- // cl_fgetline().
- 
- // General includes.
-+#include <cstdio>
- #include "cl_sysdep.h"
- 
- // Specification.
---- ./src/base/string/input/cl_st_getline2.cc~	2000-12-14 11:53:06.000000000 -0500
-+++ ./src/base/string/input/cl_st_getline2.cc	2009-06-08 19:18:12.899175378 -0400
-@@ -1,6 +1,7 @@
- // cl_fgetline().
- 
- // General includes.
-+#include <cstdio>
- #include "cl_sysdep.h"
- 
- // Specification.
---- ./src/base/string/input/cl_st_gettoken.cc~	2004-06-23 17:11:21.000000000 -0400
-+++ ./src/base/string/input/cl_st_gettoken.cc	2009-06-08 19:47:41.202332829 -0400
-@@ -1,6 +1,7 @@
- // operator>>.
- 
- // General includes.
-+#include <cstdio>
- #include "cl_sysdep.h"
- 
- // Specification.