diff --git a/fc-discuss/Makefile b/fc-discuss/Makefile
index 1af7ad600a3fb4b5f03d2fb56ecfe1a1c68b2648..791f0d5bae3965268179fab950f21654825ecd6a 100644
--- a/fc-discuss/Makefile
+++ b/fc-discuss/Makefile
@@ -1,20 +1,28 @@
-ARCHIVES:=$(wildcard *.txt.gz)
+ARCHIVES:=$(shell ls *.txt.gz | LC_ALL=C sort -t- -k1n -k2M)
 OUTDIR:=html/fc-discuss
 OUTROOT:=..
 OUTTARGET:=$(OUTROOT)/$(OUTDIR)
 HTML:=$(ARCHIVES:%.txt.gz=$(OUTTARGET)/%/maillist.html)
 
-$(OUTTARGET)/archives.md: $(HTML) archives-header.md
+$(OUTTARGET)/archives.md: $(HTML) archives-header.md Makefile
 	rm -fr $@
 	cp archives-header.md $@
 	$(foreach file,$(HTML), \
-	  BASE=$(file:$(OUTTARGET)/%/index.html=%); \
+	  BASE=$(file:$(OUTTARGET)/%/maillist.html=%); \
 	  echo "## $$BASE" >> $@; \
           echo "- [By date]($$BASE/maillist.html)" >> $@; \
-	  echo "- [By thread]($$BASE/thread.html)" >> $@; \
+	  echo "- [By thread]($$BASE/threads.html)" >> $@; \
 	  echo "" >> $@; \
          )
 
-$(OUTTARGET)/%/maillist.html: %.txt.gz
+$(OUTTARGET)/%/maillist.html: %.txt.gz mhonarc-config.rc
 	mkdir -p $(dir $@)
-	mhonarc -outdir $(dir $@) $<
+	MONTH=$$(echo $* | cut -d- -f2) \
+	YEAR=$$(echo $* | cut -d- -f1) \
+	mhonarc -rcfile mhonarc-config.rc -outdir $(dir $@) $<
+	for file in $(dir $@)/msg*.html; do \
+	  sed -i -e 's/{{/{\&zwnj;{/g' -e 's/}}/}\&zwnj;}/g' $$file; \
+	done
+
+clean:
+	rm -fr $(OUTTARGET)
diff --git a/fc-discuss/mhonarc-config.rc b/fc-discuss/mhonarc-config.rc
new file mode 100644
index 0000000000000000000000000000000000000000..5e02876c2f91ed93aad024f9309fd0696cb397f0
--- /dev/null
+++ b/fc-discuss/mhonarc-config.rc
@@ -0,0 +1,80 @@
+<!-- configuration file for the layout of archive pages -->
+<TextEncode>
+utf-8; MHonArc::UTF8::to_utf8; MHonArc/UTF8.pm
+</TextEncode>
+
+<TITLE>
+Old Frama-C mailing list archives for $ENV(MONTH)$ $ENV(YEAR)$
+</TITLE>
+<TTITLE>
+Old Frama-C mailing list archives (by thread)
+</TTITLE>
+
+<SSMARKUP>
+---
+layout: default
+title: Old Frama-C mailing list archives
+---
+</SSMARKUP>
+
+<IDXPGSSMARKUP>
+---
+layout: default
+title: $IDXTITLE$
+---
+</IDXPGSSMARKUP>
+
+<IDXPGBEGIN>
+<h1>$IDXTITLE$</h1>
+</IDXPGBEGIN>
+
+<LISTBEGIN>
+<ul>
+<li><a href="/html/fc-discuss/archives.html">Main index</a></li>
+<li><a href="$TIDXFNAME$">Thread index for $ENV(MONTH)$ $ENV(YEAR)$</a></li>
+</ul>
+<hr>
+<ul>
+</LISTBEGIN>
+
+<IDXPGEND>
+<!--  -->
+</IDXPGEND>
+
+<TIDXPGSSMARKUP>
+---
+layout: default
+title: $TIDXTITLE$
+---
+</TIDXPGSSMARKUP>
+
+<TIDXPGBEGIN>
+<h1>$TIDXTITLE$</h1>
+</TIDXPGBEGIN>
+
+<TLISTBEGIN>
+<ul>
+<li><a href="/html/fc-discuss/archives.html">Main index</li>
+<li><a href="$TIDXFNAME$">Date index for $ENV(MONTH)$ $ENV(YEAR)$</li>
+</ul>
+<hr>
+<ul>
+</TLISTBEGIN>
+
+<TIDXPGEND>
+</TIDXPGEND>
+
+<MSGPGSSMARKUP>
+---
+layout: default
+title: Message $ORDNUM$ from Frama-C-discuss on $ENV(MONTH)$ $ENV(YEAR)$
+---
+</MSGPGSSMARKUP>
+
+<MSGPGBEGIN>
+<!-- -->
+</MSGPGBEGIN>
+
+<MSGPGEND>
+<!-- -->
+</MSGPGEND>