diff --git a/Makefile b/Makefile
index d5ea683..feeb30d 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,11 @@
 #   https://pypi.python.org/pypi/xml2rfc
 xml2rfc ?= xml2rfc
 #  mmark (https://github.com/miekg/mmark)
-mmark ?= mmark
+mmark ?= mmark -xml2 -page
+ifneq (,$(XML_LIBRARY))
+	mmark += -bib-id $(XML_LIBRARY) -bib-rfc $(XML_LIBRARY)
+endif
+
 
 DRAFT = draft-jennings-4572bis
 VERSION = 00
@@ -24,7 +28,7 @@ clean:
 	$(xml2rfc) -N $< -o $@ --html
 
 $(DRAFT)-$(VERSION).xml: $(DRAFT).md 
-	mmark -xml2 -page -bib-id $(XML_LIBRARY)/ -bib-rfc $(XML_LIBRARY)/  $^ $@ 
+	$(mmark) -xml2 -page $< $@
 
 $(DRAFT).diff.html: $(DRAFT)-$(VERSION).txt $(DRAFT)-old.txt 
 	htmlwdiff   $(DRAFT)-old.txt   $(DRAFT)-$(VERSION).txt >   $(DRAFT).diff.html
diff --git a/draft-jennings-4572bis.md b/draft-jennings-4572bis.md
index 9a671ba..f6f7f05 100644
--- a/draft-jennings-4572bis.md
+++ b/draft-jennings-4572bis.md
@@ -298,16 +298,19 @@ ensures that the security properties required for the certificate also
 apply for the fingerprint.  It also guarantees that the fingerprint
 will be usable by the other endpoint, so long as the certificate
 itself is.)
+
 Following RFC 3279 [@!RFC3279] as updated by RFC 4055 [@!RFC4055],
 therefore, the defined hash functions are 'SHA-1' [@!FIPS.180-2.2002]
 [@RFC3174], 'SHA-224' [@!FIPS.180-2.2002], 'SHA-256'
 [@!FIPS.180-2.2002], 'SHA-384' [@!FIPS.180-2.2002], 'SHA-512'
 [@!FIPS.180-2.2002], 'MD5' [@!RFC1321], and 'MD2' [@!RFC1319],
 with 'SHA-1' preferred.
+
 A new IANA registry of Hash Function Textual Names, specified in
 Section 8, allows for addition of future tokens, but they may only be
 added if they are included in RFCs that update or obsolete RFC 3279
 [@!RFC3279].
+
 Self-signed certificates (for which legacy certificates are not a
 consideration) MUST use one of the FIPS 180 algorithms (SHA-1,
 SHA-224, SHA-256, SHA-384, or SHA-512) as their signature algorithm,