diff --git a/library.html.tpl b/library.html.tpl
index 4f43d50..2cc608e 100644
--- a/library.html.tpl
+++ b/library.html.tpl
@@ -34,7 +34,8 @@ Test started: #timeStart#<br/>
 Total time taken: #totalTime#<br>
 System info: #sysInfo#</p>
 <p>OpenModelica Version: #omcVersion#<br>
-#fmi#<br>
+#fmiToolVersion#
+#fmi#
 OpenModelicaLibraryTesting Changes<br>
 #OpenModelicaLibraryTesting#</p>
 <p>Tested Library: #fileName# #libraryVersionRevision#<pre>
diff --git a/test.py b/test.py
index e2c870e..e643fcf 100755
--- a/test.py
+++ b/test.py
@@ -1075,6 +1075,7 @@ def cpu_name():
   replacements = (
     (u"#sysInfo#", html.escape(sysInfo)),
     (u"#omcVersion#", html.escape(omc_version)),
+    (u"#fmiVersion#", ("<p>"+html.escape("FMI tool: %s" % fmisimulatorversion)+"</p>") if fmisimulatorversion else ""),
     (u"#fmi#", ("<p>"+html.escape("FMI version: %s" % conf.get("fmi"))+"</p>") if conf.get("fmi") else ""),
     (u"#optlevel#", html.escape(conf.get("optlevel")) if (canChangeOptLevel and conf.get("optlevel")) else "Tool default"),
     (u"#timeStart#", html.escape(time.strftime('%Y-%m-%d %H:%M:%S', start_as_time))),