diff --git a/plugins/jvm/jstat__heap b/plugins/jvm/jstat__heap
index 8142273d..e89d434b 100755
--- a/plugins/jvm/jstat__heap
+++ b/plugins/jvm/jstat__heap
@@ -124,6 +124,11 @@ print_stats() {
                 S1F = $idx["S1C"] - $idx["S1U"];
                 EF  = $idx["EC"]  - $idx["EU"];
                 OF  = $idx["OC"]  - $idx["OU"];
+                # Java <8 has Permanent Generation (PU,PC columns), while >=8 has/names it Metaspace (MU,MC)
+                if (idx["MU"] == "") {
+                    idx["MU"] = idx["PU"];
+                    idx["MC"] = idx["PC"];
+                }
                 MF  = $idx["MC"]  - $idx["MU"];
                 print "Eden_Used.value " $idx["EU"] * 1024;
                 print "Eden_Free.value " EF * 1024;