diff --git a/.gitignore b/.gitignore
index a02a2450..68a43249 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,5 +3,8 @@ _site
 *lhomme-cellar-matroska-*
 *lhomme-cellar-codecs-*
 *lhomme-cellar-tags-*
+*ietf-cellar-matroska-*
+*ietf-cellar-codecs-*
+*ietf-cellar-tags-*
 ebml_matroska_elements.md
 ebml_matroska_elements4rfc.md
diff --git a/Makefile b/Makefile
index 0c7b3a29..28d1757b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,14 @@
 $(info RFC rendering has been tested with mmark version 1.3.4 and xml2rfc 2.5.1, please ensure these are installed and recent enough.)
 
-VERSION_MATROSKA := 04
+VERSION_MATROSKA := 00
 VERSION_CODEC := 00
 VERSION_TAGS := 00
 STATUS_MATROSKA := draft-
 STATUS_CODEC := draft-
 STATUS_TAGS := draft-
-OUTPUT_MATROSKA := $(STATUS_MATROSKA)lhomme-cellar-matroska-$(VERSION_MATROSKA)
-OUTPUT_CODEC := $(STATUS_CODEC)lhomme-cellar-codecs-$(VERSION_CODEC)
-OUTPUT_TAGS := $(STATUS_TAGS)lhomme-cellar-tags-$(VERSION_TAGS)
+OUTPUT_MATROSKA := $(STATUS_MATROSKA)ietf-cellar-matroska-$(VERSION_MATROSKA)
+OUTPUT_CODEC := $(STATUS_CODEC)ietf-cellar-codecs-$(VERSION_CODEC)
+OUTPUT_TAGS := $(STATUS_TAGS)ietf-cellar-tags-$(VERSION_TAGS)
 
 all: $(OUTPUT_MATROSKA).html $(OUTPUT_MATROSKA).txt $(OUTPUT_MATROSKA).xml $(OUTPUT_CODEC).html $(OUTPUT_CODEC).txt $(OUTPUT_CODEC).xml $(OUTPUT_TAGS).html $(OUTPUT_TAGS).txt $(OUTPUT_TAGS).xml
 
diff --git a/index_codec.md b/index_codec.md
index 6efcd1b1..eedd6b94 100644
--- a/index_codec.md
+++ b/index_codec.md
@@ -4,7 +4,7 @@
 % Title = "Matroska Codec"
 % abbrev = "Matroska"
 % category = "std"
-% docName = "draft-lhomme-cellar-codec-00"
+% docName = "draft-ietf-cellar-codec-00"
 % ipr= "trust200902"
 % area = "art"
 % workgroup = "cellar"
diff --git a/index_matroska.md b/index_matroska.md
index b0efc878..046c8606 100644
--- a/index_matroska.md
+++ b/index_matroska.md
@@ -4,7 +4,7 @@
 % Title = "Matroska Specifications"
 % abbrev = "Matroska"
 % category = "std"
-% docName = "draft-lhomme-cellar-matroska-04"
+% docName = "draft-ietf-cellar-matroska-00"
 % ipr= "trust200902"
 % area = "art"
 % workgroup = "cellar"
diff --git a/index_tags.md b/index_tags.md
index 3bbdc3fe..6a1177d8 100644
--- a/index_tags.md
+++ b/index_tags.md
@@ -4,7 +4,7 @@
 % Title = "Matroska Tags"
 % abbrev = "Matroska"
 % category = "std"
-% docName = "draft-lhomme-cellar-tags-00"
+% docName = "draft-ietf-cellar-tags-00"
 % ipr= "trust200902"
 % area = "art"
 % workgroup = "cellar"