diff --git a/src/rig.c b/src/rig.c
index aa7886106..1452d96fe 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -72,6 +72,7 @@
 #include "gpio.h"
 #include "misc.h"
 #include "sprintflst.h"
+#include "../tests/hamlibdatetime.h"
 
 /**
  * \brief Hamlib release number
@@ -86,7 +87,7 @@
 const char *hamlib_license = "LGPL";
 //! @cond Doxygen_Suppress
 const char hamlib_version[21] = "Hamlib " PACKAGE_VERSION;
-const char *hamlib_version2 = "Hamlib " PACKAGE_VERSION;
+const char *hamlib_version2 = "Hamlib " PACKAGE_VERSION " " HAMLIBDATETIME;
 //! @endcond
 
 struct rig_caps caps_test;
diff --git a/tests/ampctl.c b/tests/ampctl.c
index 787cbbdef..5efeacfd0 100644
--- a/tests/ampctl.c
+++ b/tests/ampctl.c
@@ -278,8 +278,7 @@ int main(int argc, char *argv[])
 
     rig_set_debug(verbose);
 
-    rig_debug(RIG_DEBUG_VERBOSE, "ampctl %s\nLast commit was %s\n", hamlib_version,
-              HAMLIBDATETIME);
+    rig_debug(RIG_DEBUG_VERBOSE, "ampctl %s\n", hamlib_version2);
     rig_debug(RIG_DEBUG_VERBOSE, "%s",
               "Report bugs to <hamlib-developer@lists.sourceforge.net>\n\n");
 
diff --git a/tests/ampctl_parse.c b/tests/ampctl_parse.c
index 4c7eee002..21f7beaeb 100644
--- a/tests/ampctl_parse.c
+++ b/tests/ampctl_parse.c
@@ -1436,7 +1436,7 @@ int ampctl_parse(AMP *my_amp, FILE *fin, FILE *fout, char *argv[], int argc)
 
 void version()
 {
-    printf("ampctl(d), %s\n\n", hamlib_version);
+    printf("ampctl(d), %s\n\n", hamlib_version2);
     printf("%s\n", hamlib_copyright);
 }
 
diff --git a/tests/ampctld.c b/tests/ampctld.c
index 730c086e1..12b6e2a54 100644
--- a/tests/ampctld.c
+++ b/tests/ampctld.c
@@ -309,7 +309,7 @@ int main(int argc, char *argv[])
 
     rig_set_debug(verbose);
 
-    rig_debug(RIG_DEBUG_VERBOSE, "ampctld, %s\n", hamlib_version);
+    rig_debug(RIG_DEBUG_VERBOSE, "ampctld, %s\n", hamlib_version2);
     rig_debug(RIG_DEBUG_VERBOSE, "%s",
               "Report bugs to <hamlib-developer@lists.sourceforge.net>\n\n");
 
diff --git a/tests/rigctl.c b/tests/rigctl.c
index e982dbce6..126f5275a 100644
--- a/tests/rigctl.c
+++ b/tests/rigctl.c
@@ -177,7 +177,7 @@ int main(int argc, char *argv[])
             exit(0);
 
         case 'V':
-            printf("rigctl %s\nLast commit was %s\n", hamlib_version, HAMLIBDATETIME);
+            printf("rigctl %s\n", hamlib_version2);
             exit(0);
 
         case 'm':
@@ -433,8 +433,7 @@ int main(int argc, char *argv[])
 
     rig_set_debug(verbose);
 
-    rig_debug(RIG_DEBUG_VERBOSE, "rigctl %s\nLast commit was %s\n", hamlib_version,
-              HAMLIBDATETIME);
+    rig_debug(RIG_DEBUG_VERBOSE, "rigctl %s\n", hamlib_version2);
     rig_debug(RIG_DEBUG_VERBOSE, "%s",
               "Report bugs to <hamlib-developer@lists.sourceforge.net>\n\n");
 
diff --git a/tests/rigctl_parse.c b/tests/rigctl_parse.c
index 729382ba9..d136de7d0 100644
--- a/tests/rigctl_parse.c
+++ b/tests/rigctl_parse.c
@@ -1732,7 +1732,7 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc,
 
 void version()
 {
-    printf("rigctl(d), %s\n\n", hamlib_version);
+    printf("rigctl(d), %s\n\n", hamlib_version2);
     printf("%s\n", hamlib_copyright);
 }
 
diff --git a/tests/rigctld.c b/tests/rigctld.c
index 46ba02757..2cc7c2628 100644
--- a/tests/rigctld.c
+++ b/tests/rigctld.c
@@ -286,7 +286,7 @@ int main(int argc, char *argv[])
             exit(0);
 
         case 'V':
-            printf("rigctl %s\nLast commit was %s\n", hamlib_version, HAMLIBDATETIME);
+            printf("rigctl %s\n", hamlib_version2);
             exit(0);
 
         case 'm':
@@ -556,8 +556,7 @@ int main(int argc, char *argv[])
 
     rig_set_debug(verbose);
 
-    rig_debug(RIG_DEBUG_VERBOSE, "rigctld %s\nLast commit was %s\n", hamlib_version,
-              HAMLIBDATETIME);
+    rig_debug(RIG_DEBUG_VERBOSE, "rigctld %s\n", hamlib_version2);
     rig_debug(RIG_DEBUG_VERBOSE, "%s",
               "Report bugs to <hamlib-developer@lists.sourceforge.net>\n\n");
 
diff --git a/tests/rigmem.c b/tests/rigmem.c
index c8ab19a3e..4d422747b 100644
--- a/tests/rigmem.c
+++ b/tests/rigmem.c
@@ -233,7 +233,7 @@ int main(int argc, char *argv[])
 
     rig_set_debug(verbose < 2 ? RIG_DEBUG_WARN : verbose);
 
-    rig_debug(RIG_DEBUG_VERBOSE, "rigmem, %s\n", hamlib_version);
+    rig_debug(RIG_DEBUG_VERBOSE, "rigmem, %s\n", hamlib_version2);
     rig_debug(RIG_DEBUG_VERBOSE, "%s",
               "Report bugs to "
               "<hamlib-developer@lists.sourceforge.net>\n\n");
@@ -406,7 +406,7 @@ int main(int argc, char *argv[])
 
 void version()
 {
-    printf("rigmem, %s\n\n", hamlib_version);
+    printf("rigmem, %s\n\n", hamlib_version2);
     printf("%s\n", hamlib_copyright);
 }
 
diff --git a/tests/rigsmtr.c b/tests/rigsmtr.c
index 4a99570fa..b992dd91c 100644
--- a/tests/rigsmtr.c
+++ b/tests/rigsmtr.c
@@ -242,7 +242,7 @@ int main(int argc, char *argv[])
 
     rig_set_debug(verbose < 2 ? RIG_DEBUG_WARN : verbose);
 
-    rig_debug(RIG_DEBUG_VERBOSE, "rigsmtr, %s\n", hamlib_version);
+    rig_debug(RIG_DEBUG_VERBOSE, "rigsmtr, %s\n", hamlib_version2);
     rig_debug(RIG_DEBUG_VERBOSE, "%s",
               "Report bugs to <hamlib-developer@lists.sourceforge.net>\n\n");
 
@@ -409,7 +409,7 @@ int main(int argc, char *argv[])
 
 void version()
 {
-    printf("rigsmtr, %s\n\n", hamlib_version);
+    printf("rigsmtr, %s\n\n", hamlib_version2);
     printf("%s\n", hamlib_copyright);
 }
 
diff --git a/tests/rigswr.c b/tests/rigswr.c
index 88d89d4cc..6ceec7053 100644
--- a/tests/rigswr.c
+++ b/tests/rigswr.c
@@ -231,7 +231,7 @@ int main(int argc, char *argv[])
 
     rig_set_debug(verbose < 2 ? RIG_DEBUG_WARN : verbose);
 
-    rig_debug(RIG_DEBUG_VERBOSE, "rigswr, %s\n", hamlib_version);
+    rig_debug(RIG_DEBUG_VERBOSE, "rigswr, %s\n", hamlib_version2);
     rig_debug(RIG_DEBUG_VERBOSE, "%s",
               "Report bugs to <hamlib-developer@lists.sourceforge.net>\n\n");
 
@@ -351,7 +351,7 @@ int main(int argc, char *argv[])
 
 void version()
 {
-    printf("rigswr, %s\n\n", hamlib_version);
+    printf("rigswr, %s\n\n", hamlib_version2);
     printf("%s\n", hamlib_copyright);
 }
 
diff --git a/tests/rotctl.c b/tests/rotctl.c
index 633d052cf..9a222dc08 100644
--- a/tests/rotctl.c
+++ b/tests/rotctl.c
@@ -305,8 +305,7 @@ int main(int argc, char *argv[])
 
     rig_set_debug(verbose);
 
-    rig_debug(RIG_DEBUG_VERBOSE, "rotctl %s\nLast commit was %s\n", hamlib_version,
-              HAMLIBDATETIME);
+    rig_debug(RIG_DEBUG_VERBOSE, "rotctl %s\n", hamlib_version2);
     rig_debug(RIG_DEBUG_VERBOSE, "%s",
               "Report bugs to <hamlib-developer@lists.sourceforge.net>\n\n");
 
diff --git a/tests/rotctl_parse.c b/tests/rotctl_parse.c
index 1c9602801..6f14a808a 100644
--- a/tests/rotctl_parse.c
+++ b/tests/rotctl_parse.c
@@ -1507,7 +1507,7 @@ int rotctl_parse(ROT *my_rot, FILE *fin, FILE *fout, char *argv[], int argc,
 
 void version()
 {
-    printf("rotctl(d), %s\n\n", hamlib_version);
+    printf("rotctl(d), %s\n\n", hamlib_version2);
     printf("%s\n", hamlib_copyright);
 }
 
diff --git a/tests/rotctld.c b/tests/rotctld.c
index 8b28c3bb6..e7f81f9fc 100644
--- a/tests/rotctld.c
+++ b/tests/rotctld.c
@@ -322,7 +322,7 @@ int main(int argc, char *argv[])
 
     rig_set_debug(verbose);
 
-    rig_debug(RIG_DEBUG_VERBOSE, "rotctld, %s\n", hamlib_version);
+    rig_debug(RIG_DEBUG_VERBOSE, "rotctld, %s\n", hamlib_version2);
     rig_debug(RIG_DEBUG_VERBOSE, "%s",
               "Report bugs to <hamlib-developer@lists.sourceforge.net>\n\n");