diff --git a/bip-0348.md b/bip-0348.md
index d65a0d75..cd8e45ac 100644
--- a/bip-0348.md
+++ b/bip-0348.md
@@ -1,4 +1,4 @@
-<pre>
+```
   BIP: 348
   Layer: Consensus (soft fork)
   Title: CHECKSIGFROMSTACK
@@ -9,7 +9,7 @@
   Type: Standards Track
   Created: 2024-11-26
   License: BSD-3-Clause
-</pre>
+```
 
 ## Abstract
 
diff --git a/bip-0349.md b/bip-0349.md
index 22e07307..afd111a9 100644
--- a/bip-0349.md
+++ b/bip-0349.md
@@ -1,4 +1,4 @@
-<pre>
+```
   BIP: 349
   Layer: Consensus (soft fork)
   Title: OP_INTERNALKEY
@@ -9,7 +9,7 @@
   Type: Standards Track
   Created: 2024-11-14
   License: BSD-3-Clause
-</pre>
+```
 
 ## Abstract
 
diff --git a/bip-0379.md b/bip-0379.md
index c8e6b160..1648a474 100644
--- a/bip-0379.md
+++ b/bip-0379.md
@@ -1,4 +1,4 @@
-<pre>
+```
   BIP: 379
   Layer: Applications
   Title: Miniscript
@@ -13,7 +13,7 @@
   Type: Informational
   Created: 2023-10-10
   License: CC0-1.0
-</pre>
+```
 
 ## Abstract
 
diff --git a/scripts/buildtable.pl b/scripts/buildtable.pl
index 4923a9ed..acec8acf 100755
--- a/scripts/buildtable.pl
+++ b/scripts/buildtable.pl
@@ -96,19 +96,28 @@ my %emails;
 my $bipnum = 0;
 while (++$bipnum <= $topbip) {
 	my $fn = sprintf "bip-%04d.mediawiki", $bipnum;
+	my $is_markdown = 0;
 	if (!-e $fn) {
 		$fn = sprintf "bip-%04d.md", $bipnum;
+		$is_markdown = 1;
 	}
 	-e $fn || next;
 	open my $F, "<$fn";
-	while (<$F> !~ m[^(?:\xef\xbb\xbf)?<pre>$]) {
+	if ($is_markdown) {
+		while (<$F> !~ m[^(?:\xef\xbb\xbf)?```$]) {
+			die "No ``` in $fn" if eof $F;
+		}
+	} else {
+		while (<$F> !~ m[^(?:\xef\xbb\xbf)?<pre>$]) {
 			die "No <pre> in $fn" if eof $F;
+		}
 	}
 	my %found;
 	my ($title, $author, $status, $type, $layer);
 	my ($field, $val);
 	while (<$F>) {
-		m[^</pre>$] && last;
+		last if ($is_markdown && m[^```$]);
+		last if (!$is_markdown && m[^</pre>$]);
 		if (m[^  ([\w-]+)\: (.*\S)$]) {
 			$field = $1;
 			$val = $2;