diff --git a/Makefile b/Makefile
index d7f118d5..872b426d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
-VERSION_MATROSKA := 04
-VERSION_CODEC := 03
-VERSION_TAGS := 03
+VERSION_MATROSKA := 05
+VERSION_CODEC := 04
+VERSION_TAGS := 04
 STATUS_MATROSKA := draft-
 STATUS_CODEC := draft-
 STATUS_TAGS := draft-
@@ -43,7 +43,7 @@ $(OUTPUT_TAGS).md: index_tags.md tagging.md matroska_tagging_registry.md tagging
 	cat $^ > $@
 
 %.xml: %.md
-	$(MMARK) $< | awk '/<?rfc toc=/ && !modif { printf("<?rfc tocdepth=\"6\"?>\n"); modif=1 } {print}' | sed 's|<sourcecode type="xml">|<artwork type="ascii-art">|g;s|</sourcecode>|</artwork>|g' > $@
+	$(MMARK) $< | awk '/<?rfc toc=/ && !modif { printf("<?rfc tocdepth=\"6\"?>\n"); modif=1 } {print}' > $@
 
 %.html: %.xml
 	$(XML2RFC) --html $< -o $@
diff --git a/index_codec.md b/index_codec.md
index 3b99ac5f..f2a6f409 100644
--- a/index_codec.md
+++ b/index_codec.md
@@ -10,7 +10,7 @@ keyword = [""]
 name = "Internet Draft"
 stream = "IETF"
 status = "informational"
-value = "draft-ietf-cellar-codec-03"
+value = "draft-ietf-cellar-codec-04"
 
 [[author]]
 initials="S."
diff --git a/index_matroska.md b/index_matroska.md
index 032978d0..960481a4 100644
--- a/index_matroska.md
+++ b/index_matroska.md
@@ -10,7 +10,7 @@ keyword = [""]
 name = "Internet-Draft"
 stream = "IETF"
 status = "informational"
-value = "draft-ietf-cellar-matroska-04"
+value = "draft-ietf-cellar-matroska-05"
 
 [[author]]
 initials="S."
diff --git a/index_tags.md b/index_tags.md
index 0087133e..9402ed69 100644
--- a/index_tags.md
+++ b/index_tags.md
@@ -10,7 +10,7 @@ keyword = [""]
 name = "Internet-Draft"
 stream = "IETF"
 status = "informational"
-value = "draft-ietf-cellar-tags-03"
+value = "draft-ietf-cellar-tags-04"
 
 [[author]]
 initials="S."