diff --git a/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/services/LibFreeRDP.java b/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/services/LibFreeRDP.java
index 59ace491a..4beef76b0 100644
--- a/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/services/LibFreeRDP.java
+++ b/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/services/LibFreeRDP.java
@@ -73,8 +73,6 @@ public class LibFreeRDP
 
 	private static native String freerdp_get_version();
 
-	private static native String freerdp_get_build_date();
-
 	private static native String freerdp_get_build_revision();
 
 	private static native String freerdp_get_build_config();
diff --git a/client/Android/android_freerdp.c b/client/Android/android_freerdp.c
index ecbc8913e..0fd987f44 100644
--- a/client/Android/android_freerdp.c
+++ b/client/Android/android_freerdp.c
@@ -1029,11 +1029,6 @@ static jstring JNICALL jni_freerdp_get_version(JNIEnv* env, jclass cls)
 	return (*env)->NewStringUTF(env, freerdp_get_version_string());
 }
 
-static jstring JNICALL jni_freerdp_get_build_date(JNIEnv* env, jclass cls)
-{
-	return (*env)->NewStringUTF(env, freerdp_get_build_date());
-}
-
 static jstring JNICALL jni_freerdp_get_build_revision(JNIEnv* env, jclass cls)
 {
 	return (*env)->NewStringUTF(env, freerdp_get_build_revision());
@@ -1047,7 +1042,6 @@ static jstring JNICALL jni_freerdp_get_build_config(JNIEnv* env, jclass cls)
 static JNINativeMethod methods[] = {
 	{ "freerdp_get_jni_version", "()Ljava/lang/String;", &jni_freerdp_get_jni_version },
 	{ "freerdp_get_version", "()Ljava/lang/String;", &jni_freerdp_get_version },
-	{ "freerdp_get_build_date", "()Ljava/lang/String;", &jni_freerdp_get_build_date },
 	{ "freerdp_get_build_revision", "()Ljava/lang/String;", &jni_freerdp_get_build_revision },
 	{ "freerdp_get_build_config", "()Ljava/lang/String;", &jni_freerdp_get_build_config },
 	{ "freerdp_get_last_error_string", "(J)Ljava/lang/String;",
diff --git a/client/common/client.c b/client/common/client.c
index 0cdb636d8..c811b0489 100644
--- a/client/common/client.c
+++ b/client/common/client.c
@@ -233,7 +233,7 @@ int freerdp_client_settings_parse_command_line(rdpSettings* settings, int argc,
 	if (!freerdp_client_settings_post_process(settings))
 		status = -1;
 
-	WLog_DBG(TAG, "This is %s", freerdp_get_build_config());
+	WLog_DBG(TAG, "This is %s %s", freerdp_get_version_string(), freerdp_get_build_config());
 	return status;
 }
 
diff --git a/client/common/cmdline.c b/client/common/cmdline.c
index 13329f425..2f96ae087 100644
--- a/client/common/cmdline.c
+++ b/client/common/cmdline.c
@@ -3427,7 +3427,7 @@ int freerdp_client_settings_parse_command_line_arguments(rdpSettings* settings,
 }
 
 static BOOL freerdp_client_load_static_channel_addin(rdpChannels* channels, rdpSettings* settings,
-                                                     char* name, void* data)
+                                                     const char* name, void* data)
 {
 	PVIRTUALCHANNELENTRY entry = NULL;
 	PVIRTUALCHANNELENTRYEX entryEx = NULL;
diff --git a/include/freerdp/freerdp.h b/include/freerdp/freerdp.h
index 069e11913..0602dd35f 100644
--- a/include/freerdp/freerdp.h
+++ b/include/freerdp/freerdp.h
@@ -460,7 +460,6 @@ extern "C"
 
 	FREERDP_API void freerdp_get_version(int* major, int* minor, int* revision);
 	FREERDP_API const char* freerdp_get_version_string(void);
-	FREERDP_API const char* freerdp_get_build_date(void);
 	FREERDP_API const char* freerdp_get_build_revision(void);
 	FREERDP_API const char* freerdp_get_build_config(void);
 
diff --git a/libfreerdp/core/freerdp.c b/libfreerdp/core/freerdp.c
index 9f0722501..371defa9d 100644
--- a/libfreerdp/core/freerdp.c
+++ b/libfreerdp/core/freerdp.c
@@ -511,12 +511,6 @@ const char* freerdp_get_version_string(void)
 	return FREERDP_VERSION_FULL;
 }
 
-const char* freerdp_get_build_date(void)
-{
-	static char build_date[] = __DATE__ " " __TIME__;
-	return build_date;
-}
-
 const char* freerdp_get_build_config(void)
 {
 	static const char build_config[] =
diff --git a/libfreerdp/core/test/TestVersion.c b/libfreerdp/core/test/TestVersion.c
index 2df2baabe..3bda19dd0 100644
--- a/libfreerdp/core/test/TestVersion.c
+++ b/libfreerdp/core/test/TestVersion.c
@@ -33,11 +33,6 @@ int TestVersion(int argc, char* argv[])
 	if (strncmp(git, GIT_REVISION, sizeof(GIT_REVISION)))
 		return -1;
 
-	build = freerdp_get_build_date();
-
-	if (!build)
-		return -1;
-
 	build = freerdp_get_build_config();
 
 	if (!build)
diff --git a/winpr/include/winpr/winpr.h b/winpr/include/winpr/winpr.h
index 5983d3e5a..e8aaf8190 100644
--- a/winpr/include/winpr/winpr.h
+++ b/winpr/include/winpr/winpr.h
@@ -78,7 +78,6 @@
 
 WINPR_API void winpr_get_version(int* major, int* minor, int* revision);
 WINPR_API const char* winpr_get_version_string(void);
-WINPR_API const char* winpr_get_build_date(void);
 WINPR_API const char* winpr_get_build_revision(void);
 WINPR_API const char* winpr_get_build_config(void);
 
diff --git a/winpr/libwinpr/utils/test/TestVersion.c b/winpr/libwinpr/utils/test/TestVersion.c
index ed18274a0..0f7c9ae19 100644
--- a/winpr/libwinpr/utils/test/TestVersion.c
+++ b/winpr/libwinpr/utils/test/TestVersion.c
@@ -36,11 +36,6 @@ int TestVersion(int argc, char* argv[])
 	if (strncmp(git, GIT_REVISION, sizeof(GIT_REVISION)))
 		return -1;
 
-	build = winpr_get_build_date();
-
-	if (!build)
-		return -1;
-
 	build = winpr_get_build_config();
 
 	if (!build)
diff --git a/winpr/libwinpr/utils/winpr.c b/winpr/libwinpr/utils/winpr.c
index 352229ad2..aa031b139 100644
--- a/winpr/libwinpr/utils/winpr.c
+++ b/winpr/libwinpr/utils/winpr.c
@@ -51,13 +51,6 @@ const char* winpr_get_version_string(void)
 	return WINPR_VERSION_FULL;
 }
 
-const char* winpr_get_build_date(void)
-{
-	static char build_date[] = __DATE__ " " __TIME__;
-
-	return build_date;
-}
-
 const char* winpr_get_build_revision(void)
 {
 	return GIT_REVISION;