diff --git a/config/CONFIG.Host.Borland b/config/CONFIG.Host.Borland
index 414c7bc14..835ebfbfe 100644
--- a/config/CONFIG.Host.Borland
+++ b/config/CONFIG.Host.Borland
@@ -2,9 +2,6 @@
 #  This file is maintained by the EPICS community.
 #  Sites may override these definitions in CONFIG_SITE.Borland
  
-# 	Use std path variables from ms
-HOME = $(HOMEDRIVE)$(HOMEPATH)
-
 BORLAND_LIB = $(BORLAND)\\lib
 BORLAND_INC = $(BORLAND)\\include
 BORLAND_BIN = $(BORLAND)\\bin
diff --git a/config/CONFIG.Host.WIN32 b/config/CONFIG.Host.WIN32
index 5e9732a88..3a619dffe 100644
--- a/config/CONFIG.Host.WIN32
+++ b/config/CONFIG.Host.WIN32
@@ -3,9 +3,6 @@
 #  This file is maintained by the EPICS community.
 #  Sites may override these definitions in CONFIG_SITE.WIN32
  
-# 	Use std path variables from ms
-HOME = $(HOMEDRIVE)$(HOMEPATH)
-
 #
 # You currently get Visual C++ even if you ask for GNU.
 #
diff --git a/config/CONFIG_HOST_ARCH.Borland b/config/CONFIG_HOST_ARCH.Borland
index 7b1910d7f..b5d94c8ef 100644
--- a/config/CONFIG_HOST_ARCH.Borland
+++ b/config/CONFIG_HOST_ARCH.Borland
@@ -14,6 +14,9 @@ ECHO=echo
 
 WIND_HOST_TYPE = x86-win32
  
-# 	Use std path variables from ms
+# Does not work if using cygwin make
+# because HOME is always defined
+ifndef HOME
 HOME = $(HOMEDRIVE)$(HOMEPATH)
+endif
 
diff --git a/config/CONFIG_HOST_ARCH.WIN32 b/config/CONFIG_HOST_ARCH.WIN32
index 232272128..21bf21dc0 100644
--- a/config/CONFIG_HOST_ARCH.WIN32
+++ b/config/CONFIG_HOST_ARCH.WIN32
@@ -13,6 +13,9 @@ ECHO=echo
 
 WIND_HOST_TYPE = x86-win32
  
-# 	Use std path variables from ms
+# Does not work if using cygwin make
+# because HOME is always defined
+ifndef HOME
 HOME = $(HOMEDRIVE)$(HOMEPATH)
+endif