diff --git a/src/periph/fpga.cpp b/src/periph/fpga.cpp
index c0a473b79c1675fee592527eb0c9b23a37414995..1df48211efcdf7a4101c68839d6df1dca845b470 100644
--- a/src/periph/fpga.cpp
+++ b/src/periph/fpga.cpp
@@ -549,9 +549,9 @@ bool Periph_fpga::read_firmware_version(UCP *ucp, TermOutput& termout, int forma
     string firmware_version;
     firmware_version = date.substr(0,2) + "-" + date.substr(2,2) + "-" + date.substr(4,2);
     firmware_version += "T";
-    firmware_version += time.substr(0,2) + ":" + time.substr(2,2) + ":" + time.substr(4,2);
+    firmware_version += time.substr(0,2) + "." + time.substr(2,2) + "." + time.substr(4,2);
     firmware_version += "_";
-    firmware_version += revision + "-" + design_name;
+    firmware_version += revision + "_" + design_name;
 
     termout.nof_vals = firmware_version.size();
     termout.datatype = format;
diff --git a/src/tr.h b/src/tr.h
index a862ea2209ca48b40f03ad423171adbd65c7b35b..79221fc0d49c56ecd5d47df1ff977f7ae513d1f2 100644
--- a/src/tr.h
+++ b/src/tr.h
@@ -29,7 +29,10 @@
 #include "tools/util.h"
 #include "registers.h"
 
-#define TR_SW_VERSION "2021-04-13T14:06:22_sdptr"
+#include "../config.h"
+
+//#define TR_SW_VERSION "2021-04-13T14:06:22_sdptr"
+#define TR_SW_VERSION VERSION 
 
 namespace ublas = boost::numeric::ublas;