diff --git a/src/libCom/env/bldEnvData.pl b/src/libCom/env/bldEnvData.pl
index b9ad84aba..7e4b22470 100644
--- a/src/libCom/env/bldEnvData.pl
+++ b/src/libCom/env/bldEnvData.pl
@@ -75,6 +75,8 @@ sub GetVars
 			{
 				$value{$var} = $1;
 			}
+			# remove trailing whitespace and carriage return
+			$value{$var} =~ s/\s+$//;
 		}
 	}
 	close IN;
diff --git a/src/libCom/misc/makeEpicsVersion.pl b/src/libCom/misc/makeEpicsVersion.pl
index bb3cc36d3..87055df5a 100644
--- a/src/libCom/misc/makeEpicsVersion.pl
+++ b/src/libCom/misc/makeEpicsVersion.pl
@@ -10,6 +10,7 @@ open VARS, $ARGV[0] or die "Cannot get variables from $ARGV[0]";
 
 while (<VARS>)
 {
+	s/\s+$//;     # remove trailing white space and carriage return
 	if (/EPICS_VERSION=(.*)/)	{ $ver = $1; }
 	if (/EPICS_REVISION=(.*)/)	{ $rev = $1; }
 	if (/EPICS_MODIFICATION=(.*)/)	{ $mod = $1; }