diff --git a/src/share/vm/runtime/arguments.cpp b/src/share/vm/runtime/arguments.cpp
index 9e079cd3acbd7674c448834c6e4c77c5401f73d9..cbe41a6fffec8c6c6222cc273ae1d98ddfd03cd5 100644
--- a/src/share/vm/runtime/arguments.cpp
+++ b/src/share/vm/runtime/arguments.cpp
@@ -323,6 +323,7 @@ static ObsoleteFlag obsolete_jvm_flags[] = {
   { "AutoShutdownNMT",               JDK_Version::jdk_update(8, 40), JDK_Version::jdk(10) },
   { "CompilationRepeat",             JDK_Version::jdk(8), JDK_Version::jdk(9) },
   { "SegmentedHeapDumpThreshold",    JDK_Version::jdk_update(8, 252), JDK_Version::jdk(10) },
+  { "EnableJFR",                     JDK_Version::jdk_update(8, 262), JDK_Version::jdk(9) },
 #ifdef PRODUCT
   { "DesiredMethodLimit",
                            JDK_Version::jdk_update(7, 2), JDK_Version::jdk(8) },
diff --git a/src/share/vm/runtime/java.hpp b/src/share/vm/runtime/java.hpp
index 6b9086793766cf2036660f443144382fba9e4c07..b1240daf477ef17d17c97904069b015d5d826b67 100644
--- a/src/share/vm/runtime/java.hpp
+++ b/src/share/vm/runtime/java.hpp
@@ -138,7 +138,7 @@ class JDK_Version VALUE_OBJ_CLASS_SPEC {
     return JDK_Version(m);
   }
 
-  static JDK_Version jdk_update(uint8_t major, uint8_t update_number) {
+  static JDK_Version jdk_update(uint8_t major, uint16_t update_number) {
     return JDK_Version(major, 0, 0, update_number);
   }