diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo
index 9cba00e8eb97..97fddf56b38a 100644
--- a/x11/xscreensaver/distinfo
+++ b/x11/xscreensaver/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.34 2003/12/28 12:18:24 jmmv Exp $
+$NetBSD: distinfo,v 1.35 2004/02/26 16:42:39 jmmv Exp $
 
 SHA1 (xscreensaver-4.14.tar.gz) = 4996718deaceeb578953f400e518b745c1dd32c4
 Size (xscreensaver-4.14.tar.gz) = 3988251 bytes
 SHA1 (patch-aa) = 0b4de3babe3fe191943ce31c055e8047911c1326
 SHA1 (patch-ab) = 3dc02761edb19658e17935bd245208fa7387316d
-SHA1 (patch-ac) = 9b82326439791ecc8e05e85a4d691109b4e50e68
+SHA1 (patch-ac) = 84f30ee9e0c96e239e3747a2f1afcca31db58c52
 SHA1 (patch-ad) = 244908c3e4c278c878bf89e07bd68efb62b3fc4d
 SHA1 (patch-ae) = 16d0c8b50b2601458aaec09d1c7425fb23308225
 SHA1 (patch-af) = 2340efe0cf677a20c336570b24374d675f5cd6eb
diff --git a/x11/xscreensaver/patches/patch-ac b/x11/xscreensaver/patches/patch-ac
index 3cabceab6e2a..59d4178e76b1 100644
--- a/x11/xscreensaver/patches/patch-ac
+++ b/x11/xscreensaver/patches/patch-ac
@@ -1,8 +1,26 @@
-$NetBSD: patch-ac,v 1.10 2003/09/30 21:01:08 mycroft Exp $
+$NetBSD: patch-ac,v 1.11 2004/02/26 16:42:39 jmmv Exp $
 
---- configure.orig	2003-09-07 23:59:59.000000000 +0000
-+++ configure	2003-09-30 20:53:14.000000000 +0000
-@@ -11629,7 +11629,7 @@
+--- configure.orig	2003-10-25 09:47:18.000000000 +0200
++++ configure
+@@ -2592,6 +2592,9 @@ echo "${ECHO_T}Turning on SGI compiler w
+     esac
+   fi
+ 
++# Disable c89 options, since these trigger more errors than expected and
++# cause build failures.
++if false; then
+ if test -n "$GCC"; then
+    if test -n "$GCC"; then
+    echo "$as_me:$LINENO: checking whether gcc accepts -std" >&5
+@@ -2638,6 +2641,7 @@ echo "${ECHO_T}Disabling C++ comments in
+      CC="$CC -Wp,-lang-c89"
+    fi
+   fi
++fi
+ 
+ if test -n "$GCC"; then
+    if test -n "$GCC"; then
+@@ -11657,7 +11661,7 @@ if test "${ac_cv_lib_krb4_krb_get_tf_rea
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -11,7 +29,7 @@ $NetBSD: patch-ac,v 1.10 2003/09/30 21:01:08 mycroft Exp $
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
  /* confdefs.h.  */
-@@ -11709,7 +11709,7 @@
+@@ -11737,7 +11741,7 @@ echo "$as_me: WARNING: Cannot find compa
      # from Matt Knopp <mhat@infocalypse.netlag.com>
      # (who got it from amu@mit.edu)
  
@@ -20,7 +38,7 @@ $NetBSD: patch-ac,v 1.10 2003/09/30 21:01:08 mycroft Exp $
  
      # jwz: MacOS X uses -lkrb5, but not -lcrypt
  
-@@ -13711,19 +13711,7 @@
+@@ -13739,19 +13743,7 @@ fi
    fi