diff --git a/build/jam/ArchitectureRules b/build/jam/ArchitectureRules
index 4d6996b31a..d7d7940fc5 100644
--- a/build/jam/ArchitectureRules
+++ b/build/jam/ArchitectureRules
@@ -665,7 +665,22 @@ rule ArchitectureSetupWarnings architecture
 #	EnableWerror src add-ons kernel drivers display ;
 	EnableWerror src add-ons kernel drivers dvb ;
 #	EnableWerror src add-ons kernel drivers graphics ;
+#	EnableWerror src add-ons kernel drivers graphics 3dfx ;
+	EnableWerror src add-ons kernel drivers graphics ati ;
+	EnableWerror src add-ons kernel drivers graphics et6x00 ;
+	EnableWerror src add-ons kernel drivers graphics framebuffer ;
+	EnableWerror src add-ons kernel drivers graphics intel_i810 ;
 	EnableWerror src add-ons kernel drivers graphics intel_extreme ;
+	EnableWerror src add-ons kernel drivers graphics matrox ;
+#	EnableWerror src add-ons kernel drivers graphics neomagic ;
+#	EnableWerror src add-ons kernel drivers graphics nvidia ;
+#	EnableWerror src add-ons kernel drivers graphics radeon ;
+	EnableWerror src add-ons kernel drivers graphics radeon_hd ;
+#	EnableWerror src add-ons kernel drivers graphics s3 ;
+	EnableWerror src add-ons kernel drivers graphics skeleton ;
+	EnableWerror src add-ons kernel drivers graphics vesa ;
+	EnableWerror src add-ons kernel drivers graphics via ;
+	EnableWerror src add-ons kernel drivers graphics virtio ;
 	EnableWerror src add-ons kernel drivers input ;
 	EnableWerror src add-ons kernel drivers joystick ;
 	EnableWerror src add-ons kernel drivers midi ;