diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index 6ecbb60b612713875db83c29f13682707701fc93..9e069afc67f82dbf891d3497fa014adf51cad274 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -2,8 +2,8 @@
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Renchi Raju <renchi@green.tam.uiuc.edu>
 pkgname=emacs
-pkgver=23.1
-pkgrel=5
+pkgver=23.2
+pkgrel=1
 pkgdesc="The Emacs Editor"
 arch=(i686 x86_64)
 url="http://www.gnu.org/software/emacs/emacs.html"
@@ -11,18 +11,20 @@ license=('GPL')
 options=(docs)
 depends=('dbus-core' 'librsvg' 'gpm'  'giflib' 'libtiff'  'libxpm' 'libjpeg' 'gtk2' 'texinfo' 'hicolor-icon-theme')
 source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.gz emacs.desktop libpng14.patch 0001-configure.in-Invoke-CPP-with-P-when-creating-Makefil.patch)
-md5sums=('a620d4452769d04ad8864d662f34f8dd' '8af038d2ba4561271e935bb444ceb4e3'\
-         'd3e657091f41504fba7bdb0e96ec9b38' '8afbea5b319862c1449cc6534e0908de')
+sha1sums=('2f99c7111c232cf04410607698d2db842e305c82'
+          '50060b676382719955c4e43e28a597ec0bc5805a'
+          'f206f65465f32c96e08aeb37ffb5008fb818f59d'
+          '403e1461c30ce7f7e44c4d2c634dcd4a93f02a43')
 install=emacs.install
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
-  patch -p1 < $startdir/src/libpng14.patch 
-  # Patch from Upstream dev: Invoke $CPP with -P when creating Makefile
-  patch -p2 -i $startdir/src/0001-configure.in-Invoke-CPP-with-P-when-creating-Makefil.patch
   mandir=/usr/share/man
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
-  --localstatedir=/var --mandir=${mandir} --without-sound -with-x-toolkit=gtk
+  
+  # gcc 4.5 Workaround: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43904
+  CFLAGS="${CFLAGS}-fno-optimize-sibling-calls"\
+    ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
+    --localstatedir=/var --mandir=${mandir} --without-sound -with-x-toolkit=gtk
   make 
   make DESTDIR=$startdir/pkg install