diff --git a/new/builtin.jam b/new/builtin.jam
index a40e4144e..8f1da79c1 100644
--- a/new/builtin.jam
+++ b/new/builtin.jam
@@ -63,6 +63,11 @@ feature location : : free path ;
 feature dll-path : : free path ;
 feature hardcode-dll-paths : false true : incidental propagated ;
 
+
+# Windows-specific features
+
+feature user-interface : console gui wince native auto : propagated ;
+
 feature variant : : implicit composite propagated symmetric ;
 
 # Declares a new variant.
diff --git a/new/msvc.jam b/new/msvc.jam
index ff07aa685..330e0e467 100755
--- a/new/msvc.jam
+++ b/new/msvc.jam
@@ -11,8 +11,6 @@ import toolset : flags ;
 import errors : error ;
 import feature : feature ;
 
-feature user-interface : console gui wince native auto : propagated ;
-
 feature.extend toolset : msvc ;
 
 feature.subfeature toolset msvc : vendor
diff --git a/v2/msvc.jam b/v2/msvc.jam
index ff07aa685..330e0e467 100755
--- a/v2/msvc.jam
+++ b/v2/msvc.jam
@@ -11,8 +11,6 @@ import toolset : flags ;
 import errors : error ;
 import feature : feature ;
 
-feature user-interface : console gui wince native auto : propagated ;
-
 feature.extend toolset : msvc ;
 
 feature.subfeature toolset msvc : vendor
diff --git a/v2/tools/builtin.jam b/v2/tools/builtin.jam
index a40e4144e..8f1da79c1 100644
--- a/v2/tools/builtin.jam
+++ b/v2/tools/builtin.jam
@@ -63,6 +63,11 @@ feature location : : free path ;
 feature dll-path : : free path ;
 feature hardcode-dll-paths : false true : incidental propagated ;
 
+
+# Windows-specific features
+
+feature user-interface : console gui wince native auto : propagated ;
+
 feature variant : : implicit composite propagated symmetric ;
 
 # Declares a new variant.