diff --git a/Makefile b/Makefile
index 9d6ba70..0c2f3cf 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
-VERSION := 20
+VERSION := 21
 STATUS := draft-
 OUTPUT := $(STATUS)ietf-cellar-ffv1-$(VERSION)
 
-VERSION-v4 := 17
+VERSION-v4 := 18
 STATUS-v4 := draft-
 OUTPUT-v4 := $(STATUS-v4)ietf-cellar-ffv1-v4-$(VERSION-v4)
 
diff --git a/rfc_frontmatter.md b/rfc_frontmatter.md
index bc2bcab..436babc 100644
--- a/rfc_frontmatter.md
+++ b/rfc_frontmatter.md
@@ -13,8 +13,8 @@ name = "Internet-Draft"
 stream = "IETF"
 status = "informational"{V3}
 status = "standard"{V4}
-value = "draft-ietf-cellar-ffv1-20"{V3}
-value = "draft-ietf-cellar-ffv1-v4-17"{V4}
+value = "draft-ietf-cellar-ffv1-21"{V3}
+value = "draft-ietf-cellar-ffv1-v4-18"{V4}
 
 [[author]]
 initials="M."