diff --git a/srcpkgs/xscreensaver/patches/fix-cross-compile-ansi-c-test.patch b/srcpkgs/xscreensaver/patches/fix-cross-compile-ansi-c-test.patch
new file mode 100644
index 00000000000..83ed7c94136
--- /dev/null
+++ b/srcpkgs/xscreensaver/patches/fix-cross-compile-ansi-c-test.patch
@@ -0,0 +1,15 @@
+The configure script is over cautious about ANSI C support when cross-compiling.
+Simply workaround this by disabling the test code.
+
+diff -Naur configure.orig configure
+--- configure.orig	2014-11-19 08:24:01.000000000 +0100
++++ configure	2014-11-20 17:51:11.301074527 +0100
+@@ -4374,7 +4374,7 @@
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler works on ANSI C" >&5
+ $as_echo_n "checking whether the compiler works on ANSI C... " >&6; }
+   if test "$cross_compiling" = yes; then :
+-  as_fn_error $? "Couldn't build even a trivial ANSI C program: check CC." "$LINENO" 5
++  :
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
diff --git a/srcpkgs/xscreensaver/template b/srcpkgs/xscreensaver/template
index 98abc662efb..27ef41dfb9f 100644
--- a/srcpkgs/xscreensaver/template
+++ b/srcpkgs/xscreensaver/template
@@ -1,22 +1,21 @@
 # Template file for 'xscreensaver'
-pkgname="xscreensaver"
-version=5.30
-revision=2
+pkgname=xscreensaver
+version=5.32
+revision=1
 build_style=gnu-configure
 configure_args="--with-pam --with-login-manager
  --with-x-app-defaults=/usr/share/X11/app-defaults"
-conf_files="/etc/pam.d/${pkgname}"
+conf_files="/etc/pam.d/xscreensaver"
 short_desc="Screen saver and locker for the X Window System"
 maintainer="Carlo Dormeletti <carloDOTdormelettiATaliceDOTit>"
-license="GPL-2"
+license="BSD"
 hostmakedepends="bc perl pkg-config intltool"
-makedepends="pam-devel gdk-pixbuf-devel gtk+-devel
- libXt-devel libXpm-devel libxml2-devel libglade-devel 
- glu-devel libjpeg-turbo-devel libXmu-devel"
+makedepends="pam-devel gdk-pixbuf-devel gtk+-devel libXt-devel libXpm-devel
+ libxml2-devel libglade-devel glu-devel libjpeg-turbo-devel libXmu-devel"
 homepage="http://www.jwz.org/xscreensaver/"
 update_site="${homepage}download.html"
 distfiles="http://www.jwz.org/xscreensaver/xscreensaver-${version}.tar.gz"
-checksum=3771176876a402738e0f91dcb3654b57cfa430cf90d3413a6bad5daf1d085d52
+checksum=4252a6079d2d2f5b342e8bdd172cbad5f0af73daf4e412b61a68344d91ca93bd
 
 do_install() {
 	vmkdir etc/pam.d