diff --git a/lib/modules/Tools.pmod/Install.pmod b/lib/modules/Tools.pmod/Install.pmod
index d24e4030a61876865f9c2a2abed02660d886ed3e..d7f5a9d4f73883b8253858e1392ed04e47761032 100644
--- a/lib/modules/Tools.pmod/Install.pmod
+++ b/lib/modules/Tools.pmod/Install.pmod
@@ -9,6 +9,14 @@ array(string) features()
 {
   array a = ({}), m = ({});
 
+  mapping runtime_info = Pike.get_runtime_info();
+
+  if (runtime_info->auto_bignum)
+    a += ({"auto_bignum"});
+
+  if (!(<"default", "computed_goto">)[runtime_info->bytecode_method])
+    a += ({"machine_code"});
+
 #if constant(load_module)
   a += ({ "dynamic_modules" });
 #endif