diff --git a/src/core/util.c b/src/core/util.c
index d7b4491..2effcb4 100644
--- a/src/core/util.c
+++ b/src/core/util.c
@@ -365,9 +365,9 @@ LIB3270_EXPORT const char * lib3270_get_revision(void)
 	return RPQ_REVISION;
 }
 
-LIB3270_EXPORT const char * lib3270_get_build_rpq_timestamp(void)
+LIB3270_EXPORT char * lib3270_get_version_info(void)
 {
-	return RPQ_TIMESTAMP_VALUE;
+	return lib3270_strdup_printf("%s version %s-%d build %s",PACKAGE_NAME,PACKAGE_VERSION,PACKAGE_RELEASE,RPQ_REVISION);
 }
 
 void lib3270_popup_an_errno(H3270 *hSession, int errn, const char *fmt, ...)
diff --git a/src/include/lib3270/properties.h b/src/include/lib3270/properties.h
index c1c8197..5a2f097 100644
--- a/src/include/lib3270/properties.h
+++ b/src/include/lib3270/properties.h
@@ -221,11 +221,11 @@
 	LIB3270_EXPORT void lib3270_disable_crl_download(H3270 *hSession);
 
 	/**
-	 * @brief Get lib3270 build timestamp.
+	 * @brief Get lib3270 version info.
 	 *
-	 * @return String with lib3270 build timestamp.
+	 * @return String with lib3270 version info (release it with lib3270_free).
 	 */
-	LIB3270_EXPORT const char * lib3270_get_build_rpq_timestamp(void);
+	LIB3270_EXPORT char * lib3270_get_version_info(void);
 
 
 #ifdef __cplusplus
diff --git a/src/testprogram/testprogram.c b/src/testprogram/testprogram.c
index fd8be17..c147c99 100644
--- a/src/testprogram/testprogram.c
+++ b/src/testprogram/testprogram.c
@@ -40,7 +40,7 @@ int main(int argc, char *argv[])
 	setlocale( LC_ALL, "" );
 #endif
 
-	textdomain("pw3270");
+	textdomain("lib3270");
 
 //	#pragma GCC diagnostic push
 //	#pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
@@ -57,7 +57,8 @@ int main(int argc, char *argv[])
 	H3270		* h		= lib3270_session_new("");
 	int			  rc	= 0;
 
-	printf("3270 session %p created\n]",h);
+	lib3270_autoptr(char) version_info = lib3270_get_version_info();
+	printf("3270 session %p created\n%s\n]",h,version_info);
 
 #ifdef HAVE_LDAP
 	lib3270_crl_set_preferred_protocol(h,"ldap");
--
libgit2 0.21.2