diff --git a/build/jam/ArchitectureRules b/build/jam/ArchitectureRules
index a6238353e2..ff804ee009 100644
--- a/build/jam/ArchitectureRules
+++ b/build/jam/ArchitectureRules
@@ -476,7 +476,8 @@ rule ArchitectureSetupWarnings architecture
 	EnableWerror src add-ons disk_systems ;
 	EnableWerror src add-ons input_server devices ;
 	EnableWerror src add-ons input_server filters ;
-#	EnableWerror src add-ons input_server methods ;
+#	EnableWerror src add-ons input_server methods pen ;
+	EnableWerror src add-ons input_server methods t9 ;
 	EnableWerror src add-ons kernel bluetooth ;
 #	EnableWerror src add-ons kernel bus_managers acpi ;
 	EnableWerror src add-ons kernel bus_managers agp_gart ;
diff --git a/src/add-ons/input_server/methods/t9/Jamfile b/src/add-ons/input_server/methods/t9/Jamfile
index ed935806aa..9baf9b6070 100644
--- a/src/add-ons/input_server/methods/t9/Jamfile
+++ b/src/add-ons/input_server/methods/t9/Jamfile
@@ -7,11 +7,13 @@ UsePrivateHeaders interface ;
 SubDirSysHdrs $(SUBDIR) ;
 SubDirHdrs [ FDirName $(SUBDIR) t9 ] ;
 
+
 if $(TARGET_PLATFORM) != haiku {
 	SubDirC++Flags -fmultiple-symbol-spaces ;
 }
 
-Addon t9 : 
-	T9InputServerMethod.cpp
-	: be textencoding input_server ;
+
+Addon t9 :
+	T9InputServerMethod.cpp
+	: be textencoding input_server [ TargetLibsupc++ ] ;