diff --git a/configure.in b/configure.in
index 6198bb4a04..b6e70cff01 100644
--- a/configure.in
+++ b/configure.in
@@ -233,7 +233,8 @@ case "${target}" in
     ;;
   rs6000-*-*)
     # a gcc built textutils will cause the linker to hang on 'join'
-    noconfigdirs="$noconfigdirs ld binutils gas gprof textutils"
+    # The CVS server code doesn't work on the RS/6000
+    noconfigdirs="$noconfigdirs ld binutils gas gprof textutils cvs"
     ;;
   m68k-apollo-*)
     noconfigdirs="$noconfigdirs ld binutils gprof"