diff --git a/srcpkgs/xscreensaver/patches/fix-iso-c90-style-comments.patch b/srcpkgs/xscreensaver/patches/fix-iso-c90-style-comments.patch
new file mode 100644
index 00000000000..51a62948a68
--- /dev/null
+++ b/srcpkgs/xscreensaver/patches/fix-iso-c90-style-comments.patch
@@ -0,0 +1,13 @@
+--- hacks/fontglide.c	2018-09-03 01:56:45.000000000 +0300
++++ hacks/fontglide.c	2018-12-31 23:42:41.621417195 +0200
+@@ -2421,8 +2421,8 @@ fontglide_free (Display *dpy, Window win
+ 
+   textclient_close (s->tc);
+ 
+-//  if (s->b && s->b != s->window) XFreePixmap (dpy, s->b);
+-//  if (s->ba && s->ba != s->b) XFreePixmap (dpy, s->ba);
++/*  if (s->b && s->b != s->window) XFreePixmap (dpy, s->b);
++  if (s->ba && s->ba != s->b) XFreePixmap (dpy, s->ba); */
+   XFreeGC (dpy, s->bg_gc);
+   if (s->charset) free (s->charset);
+   if (s->font_override) free (s->font_override);
diff --git a/srcpkgs/xscreensaver/template b/srcpkgs/xscreensaver/template
index 7c14af0e098..3ee64a50050 100644
--- a/srcpkgs/xscreensaver/template
+++ b/srcpkgs/xscreensaver/template
@@ -1,12 +1,13 @@
 # Template file for 'xscreensaver'
 pkgname=xscreensaver
-version=5.40
+version=5.42
 revision=1
 build_style=gnu-configure
 configure_args="--with-pam --with-login-manager
  --with-x-app-defaults=/usr/share/X11/app-defaults
  --includedir=${XBPS_CROSS_BASE}/include
  --libdir=${XBPS_CROSS_BASE}/lib"
+conf_files="/etc/pam.d/xscreensaver"
 hostmakedepends="bc intltool pkg-config"
 makedepends="glu-devel libXinerama-devel libXmu-devel libXpm-devel
  libXrandr-devel libglade-devel pam-devel"
@@ -16,8 +17,7 @@ license="MIT"
 homepage="https://www.jwz.org/xscreensaver/"
 changelog="https://www.jwz.org/xscreensaver/changelog.html"
 distfiles="https://www.jwz.org/xscreensaver/xscreensaver-${version}.tar.gz"
-checksum=30a0908d4164cf780ef034f87ba884316296b308af2484261ccde86be0c95ae0
-conf_files="/etc/pam.d/xscreensaver"
+checksum=441daa033b214bfdd82b1991fbf7dc9360466bff542ce0f6002d0071a4d5cbe1
 
 do_install() {
 	vmkdir etc/pam.d