diff --git a/xserver/configure b/xserver/configure
index 18db82994..e8c4836bc 100644
--- a/xserver/configure
+++ b/xserver/configure
@@ -1075,8 +1075,6 @@ I386_VIDEO_FALSE
 I386_VIDEO_TRUE
 HPPA_VIDEO_FALSE
 HPPA_VIDEO_TRUE
-HP300_VIDEO_FALSE
-HP300_VIDEO_TRUE
 ARM_VIDEO_FALSE
 ARM_VIDEO_TRUE
 ALPHA_VIDEO_FALSE
@@ -22449,10 +22447,6 @@ $as_echo "#define USE_ALPHA_PIO 1" >>confdefs.h
 		*freebsd*)	DEFAULT_INT10=stub ;;
 	esac
 	;;
-  m68k)
-	HP300_VIDEO=yes
-	BSD_ARCH_SOURCES="hp300_video.c ioperm_noop.c"
-	;;
   m88k)
 	LUNA88K_VIDEO=yes
 	BSD_ARCH_SOURCES="luna88k_video.c ioperm_noop.c"
@@ -22519,14 +22513,6 @@ else
   ARM_VIDEO_FALSE=
 fi
 
- if test "x$HP300_VIDEO" = xyes; then
-  HP300_VIDEO_TRUE=
-  HP300_VIDEO_FALSE='#'
-else
-  HP300_VIDEO_TRUE='#'
-  HP300_VIDEO_FALSE=
-fi
-
  if test "x$HPPA_VIDEO" = xyes; then
   HPPA_VIDEO_TRUE=
   HPPA_VIDEO_FALSE='#'
@@ -27638,7 +27624,7 @@ LD_EXPORT_SYMBOLS_FLAG="-export-dynamic"
 case $host_os in
        openbsd*)
        case $host_cpu in
-       		m68k|m88k|vax)
+       		m88k)
 		LD_EXPORT_SYMBOLS_FLAGS=""
 		;;
 		*)
@@ -31716,10 +31702,6 @@ if test -z "${ARM_VIDEO_TRUE}" && test -z "${ARM_VIDEO_FALSE}"; then
   as_fn_error $? "conditional \"ARM_VIDEO\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${HP300_VIDEO_TRUE}" && test -z "${HP300_VIDEO_FALSE}"; then
-  as_fn_error $? "conditional \"HP300_VIDEO\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${HPPA_VIDEO_TRUE}" && test -z "${HPPA_VIDEO_FALSE}"; then
   as_fn_error $? "conditional \"HPPA_VIDEO\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/xserver/configure.ac b/xserver/configure.ac
index 4524d6fd0..7843e01e0 100644
--- a/xserver/configure.ac
+++ b/xserver/configure.ac
@@ -346,10 +346,6 @@ case $host_cpu in
 		*freebsd*)	DEFAULT_INT10=stub ;;
 	esac
 	;;
-  m68k)
-	HP300_VIDEO=yes
-	BSD_ARCH_SOURCES="hp300_video.c ioperm_noop.c"
-	;;
   m88k)
 	LUNA88K_VIDEO=yes
 	BSD_ARCH_SOURCES="luna88k_video.c ioperm_noop.c"
@@ -395,7 +391,6 @@ AC_SUBST(GLX_ARCH_DEFINES)
 dnl BSD *_video.c selection
 AM_CONDITIONAL(ALPHA_VIDEO, [test "x$ALPHA_VIDEO" = xyes])
 AM_CONDITIONAL(ARM_VIDEO, [test "x$ARM_VIDEO" = xyes])
-AM_CONDITIONAL(HP300_VIDEO, [test "x$HP300_VIDEO" = xyes])
 AM_CONDITIONAL(HPPA_VIDEO, [test "x$HPPA_VIDEO" = xyes])
 AM_CONDITIONAL(I386_VIDEO, [test "x$I386_VIDEO" = xyes])
 AM_CONDITIONAL(LUNA88K_VIDEO, [test "x$LUNA88K_VIDEO" = xyes])
@@ -1798,7 +1793,7 @@ LD_EXPORT_SYMBOLS_FLAG="-export-dynamic"
 case $host_os in
        openbsd*)
        case $host_cpu in
-       		m68k|m88k|vax)
+       		m88k)
 		LD_EXPORT_SYMBOLS_FLAGS=""
 		;;
 		*)