diff --git a/man/frama-c.1 b/man/frama-c.1
index f175412be20b91f5b8c7a1d557822d8e9831fa3d..cacfe5f99cbd527c92b7c2897027ebfdbbe0dd7d 100644
--- a/man/frama-c.1
+++ b/man/frama-c.1
@@ -395,7 +395,9 @@ uses \f[I]machine\f[R] as the current machine-dependent configuration
 (size of the various integer types, endiandness, \&...).
 The list of currently supported machines is available through option
 \f[I]-machdep help\f[R].
-Default is \f[B]x86_32\f[R].
+Default is \f[B]x86_64\f[R].
+The environment variable FRAMAC_MACHDEP can be used to override the default
+value. The command line parameter still has priority over the default value.
 .TP
 .B -main \f[I]f\f[R]
 sets \f[I]f\f[R] as the entry point of the analysis.
diff --git a/src/kernel_services/plugin_entry_points/kernel.ml b/src/kernel_services/plugin_entry_points/kernel.ml
index 27e2b1cd3fe12941cac241bd352aad73593f1e89..ab0efd4a4eb8ce44dffb134b0f3b3c1976d40c1c 100644
--- a/src/kernel_services/plugin_entry_points/kernel.ml
+++ b/src/kernel_services/plugin_entry_points/kernel.ml
@@ -931,11 +931,15 @@ module Machdep =
     (struct
       let module_name = "Machdep"
       let option_name = "-machdep"
-      let default = "x86_32"
+      let default =
+        try Sys.getenv "FRAMAC_MACHDEP"
+        with Not_found -> "x86_64"
       let arg_name = "machine"
       let help =
         "use <machine> as the current machine dependent configuration. \
-         See \"-machdep help\" for a list"
+         See \"-machdep help\" for a list. The environment variable \
+         FRAMAC_MACHDEP can be used to override the default value. The command \
+         line parameter still has priority over the default value"
     end)
 
 let () = Parameter_customize.set_group parsing