diff --git a/src/kernel_internals/typing/rmtmps.ml b/src/kernel_internals/typing/rmtmps.ml
index e22c883010414384126989c604b625b02faefc05..90995963c09bfedcd2f3b64be8aefa111dd3b314 100644
--- a/src/kernel_internals/typing/rmtmps.ml
+++ b/src/kernel_internals/typing/rmtmps.ml
@@ -819,7 +819,8 @@ let removeUnmarked isRoot ast reachable_tbl =
          Keep variables that were already present in the code.
       *)
       let filterLocal local =
-        if local.vtemp && not (is_reachable reachable_tbl (Var local)) then
+        if (local.vtemp || local.vstorage = Static) &&
+           not (is_reachable reachable_tbl (Var local)) then
           begin
             (* along the way, record the interesting locals that were removed *)
             let name = local.vname in
@@ -834,6 +835,7 @@ let removeUnmarked isRoot ast reachable_tbl =
         inherit Cil.nopCilVisitor
         method! vblock b =
           b.blocals <- List.filter filterLocal b.blocals;
+          b.bstatics <- List.filter filterLocal b.bstatics;
           DoChildren
       end
       in
diff --git a/tests/syntax/oracle/rmtmps_static.res.oracle b/tests/syntax/oracle/rmtmps_static.res.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..f8550f70da2e541b4f9a422731bdeb14004d4940
--- /dev/null
+++ b/tests/syntax/oracle/rmtmps_static.res.oracle
@@ -0,0 +1,12 @@
+[kernel] Parsing tests/syntax/rmtmps_static.i (no preprocessing)
+/* Generated by Frama-C */
+int f(void);
+
+int f(void)
+{
+  int __retres;
+  __retres = 0;
+  return __retres;
+}
+
+
diff --git a/tests/syntax/rmtmps_static.i b/tests/syntax/rmtmps_static.i
new file mode 100644
index 0000000000000000000000000000000000000000..7f1f9625bd23c0e227d4acc1027f7cc7c78f7a28
--- /dev/null
+++ b/tests/syntax/rmtmps_static.i
@@ -0,0 +1,4 @@
+int f() {
+  static int x = 0;
+  return 0;
+}