diff --git a/makefile b/makefile
index ea5d63a3..1e986a68 100644
--- a/makefile
+++ b/makefile
@@ -359,7 +359,7 @@ ifeq (${WIN32},)  #*nix Environments (&& cygwin)
       $(shell git log -1 --pretty="SIM_GIT_COMMIT_ID %H$(GIT_EXTRA_FILES)%nSIM_GIT_COMMIT_TIME $(isodate)" >.git-commit-id)
     endif
   endif
-  SIM_BUILD_OS_VERSION= -DSIM_BUILD_OS_VERSION="$(shell uname -a)"
+  SIM_BUILD_OS_VERSION= -DSIM_BUILD_OS_VERSION="$(shell uname -a|sed 's/,//g')"
   LTO_EXCLUDE_VERSIONS = 
   PCAPLIB = pcap
   ifeq (agcc,$(findstring agcc,${GCC})) # Android target build?
diff --git a/scp.c b/scp.c
index afb97834..9cf8ce66 100644
--- a/scp.c
+++ b/scp.c
@@ -6954,7 +6954,7 @@ if (flag) {
         char buildosversion[2*PATH_MAX+1] = S_xstr(SIM_BUILD_OS_VERSION);
 #endif
         
-        if ((f = popen ("uname -a", "r"))) {
+        if ((f = popen ("uname -a | sed 's/,//g'", "r"))) {
             memset (osversion, 0, sizeof (osversion));
             do {
                 if (NULL == fgets (osversion, sizeof (osversion)-1, f))