diff --git a/x11/Makefile b/x11/Makefile
index 093b11c0cbe7..69cb8b38cd62 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 1998/05/04 22:57:01 tron Exp $
+# $NetBSD: Makefile,v 1.31 1998/05/05 13:50:31 frueauf Exp $
 # FreeBSD Id: Makefile,v 1.156 1997/09/30 07:54:42 asami Exp
 #
 
@@ -6,6 +6,9 @@
 #    SUBDIR += XFree86
 #    SUBDIR += XFree86-contrib
     SUBDIR += Xaw3d
+#    SUBDIR += Xaw-Xpm		# don't enable this by default unless we
+				# have a CONFLICTS feature (installs same
+				# files like Xaw3d).
 #    SUBDIR += afterstep
     SUBDIR += amiwm
     SUBDIR += asclock