diff --git a/baksmali/src/test/resources/HiddenApiRestrictionsRoundtripTest/HiddenApiRestrictionsInput.smali b/baksmali/src/test/resources/HiddenApiRestrictionsRoundtripTest/HiddenApiRestrictionsInput.smali
index 1e49c1c7..af31774f 100644
--- a/baksmali/src/test/resources/HiddenApiRestrictionsRoundtripTest/HiddenApiRestrictionsInput.smali
+++ b/baksmali/src/test/resources/HiddenApiRestrictionsRoundtripTest/HiddenApiRestrictionsInput.smali
@@ -39,3 +39,7 @@
     return-void
 .end method
 
+.method private greylist-max-r greylistMaxR()V
+    .registers 1
+    return-void
+.end method
diff --git a/baksmali/src/test/resources/HiddenApiRestrictionsRoundtripTest/HiddenApiRestrictionsOutput.smali b/baksmali/src/test/resources/HiddenApiRestrictionsRoundtripTest/HiddenApiRestrictionsOutput.smali
index 4ce6914e..6b80a318 100644
--- a/baksmali/src/test/resources/HiddenApiRestrictionsRoundtripTest/HiddenApiRestrictionsOutput.smali
+++ b/baksmali/src/test/resources/HiddenApiRestrictionsRoundtripTest/HiddenApiRestrictionsOutput.smali
@@ -33,6 +33,11 @@
     return-void
 .end method
 
+.method private greylist-max-r greylistMaxR()V
+    .registers 1
+    return-void
+.end method
+
 .method private greylist-max-q core-platform-api test-api testAndCorePlatformApiMethod()V
     .registers 1
     return-void
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/HiddenApiRestriction.java b/dexlib2/src/main/java/org/jf/dexlib2/HiddenApiRestriction.java
index 4d24897b..7a9a07a1 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/HiddenApiRestriction.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/HiddenApiRestriction.java
@@ -46,6 +46,7 @@ public enum HiddenApiRestriction {
     GREYLIST_MAX_O(3, "greylist-max-o", false),
     GREYLIST_MAX_P(4, "greylist-max-p", false),
     GREYLIST_MAX_Q(5, "greylist-max-q", false),
+    GREYLIST_MAX_R(6, "greylist-max-r", false),
     CORE_PLATFORM_API(8, "core-platform-api", true),
     TEST_API(16, "test-api", true);
 
@@ -55,7 +56,8 @@ public enum HiddenApiRestriction {
             BLACKLIST,
             GREYLIST_MAX_O,
             GREYLIST_MAX_P,
-            GREYLIST_MAX_Q
+            GREYLIST_MAX_Q,
+            GREYLIST_MAX_R
     };
 
     private static final HiddenApiRestriction[] domainSpecificApiFlags = new HiddenApiRestriction[] {
diff --git a/smali/src/main/jflex/smaliLexer.jflex b/smali/src/main/jflex/smaliLexer.jflex
index 8a95648b..90fa7f19 100644
--- a/smali/src/main/jflex/smaliLexer.jflex
+++ b/smali/src/main/jflex/smaliLexer.jflex
@@ -479,7 +479,7 @@ Type = {PrimitiveType} | {ClassDescriptor} | {ArrayPrefix} ({ClassDescriptor} |
         return newToken(ACCESS_SPEC);
     }
 
-    "whitelist" | "greylist" | "blacklist" | "greylist-max-o" | "greylist-max-p" | "greylist-max-q" |
+    "whitelist" | "greylist" | "blacklist" | "greylist-max-o" | "greylist-max-p" | "greylist-max-q" | "greylist-max-r" |
     "core-platform-api" | "test-api" {
         return newToken(HIDDENAPI_RESTRICTION);
     }
diff --git a/smali/src/test/resources/LexerTest/MiscTest.smali b/smali/src/test/resources/LexerTest/MiscTest.smali
index 05d7ae6b..3290cfd0 100644
--- a/smali/src/test/resources/LexerTest/MiscTest.smali
+++ b/smali/src/test/resources/LexerTest/MiscTest.smali
@@ -40,6 +40,7 @@ blacklist
 greylist-max-o
 greylist-max-p
 greylist-max-q
+greylist-max-r
 core-platform-api
 test-api
 
@@ -94,4 +95,4 @@ field@abcd
 +1234
 
 +08
-+
\ No newline at end of file
++
diff --git a/smali/src/test/resources/LexerTest/MiscTest.tokens b/smali/src/test/resources/LexerTest/MiscTest.tokens
index 549ff854..9d31bc01 100644
--- a/smali/src/test/resources/LexerTest/MiscTest.tokens
+++ b/smali/src/test/resources/LexerTest/MiscTest.tokens
@@ -40,6 +40,7 @@ HIDDENAPI_RESTRICTION("blacklist")
 HIDDENAPI_RESTRICTION("greylist-max-o")
 HIDDENAPI_RESTRICTION("greylist-max-p")
 HIDDENAPI_RESTRICTION("greylist-max-q")
+HIDDENAPI_RESTRICTION("greylist-max-r")
 HIDDENAPI_RESTRICTION("core-platform-api")
 HIDDENAPI_RESTRICTION("test-api")
 
@@ -94,4 +95,4 @@ INVALID_TOKEN("+") POSITIVE_INTEGER_LITERAL("0x1234ABC")
 INVALID_TOKEN("+") POSITIVE_INTEGER_LITERAL("1234")
 
 INVALID_TOKEN("+") SIMPLE_NAME("08")
-INVALID_TOKEN("+")
\ No newline at end of file
+INVALID_TOKEN("+")