diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk
index 5f9aa257731b..4b47db7f59c1 100644
--- a/solenv/inc/tg_ext.mk
+++ b/solenv/inc/tg_ext.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: tg_ext.mk,v $
 #
-#   $Revision: 1.20 $
+#   $Revision: 1.21 $
 #
-#   last change: $Author: hjs $ $Date: 2001-11-07 10:48:06 $
+#   last change: $Author: hjs $ $Date: 2001-11-07 13:23:02 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -145,7 +145,11 @@ $(PACKAGE_DIR)$/$(PATCH_FLAG_FILE) : $(PACKAGE_DIR)$/$(ADD_FILES_FLAG_FILE)
 .IF "$(GUI)"=="WNT"
     +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | tr -d "\015" | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
 .ELSE           # "$(GUI)"=="WNT"
+.IF "$(BSCLIENT)"=="TRUE"
+    +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+.ELSE           # "$(BSCLIENT)"!=""
     +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+.ENDIF          # "$(BSCLIENT)"!=""
 .ENDIF          # "$(GUI)"=="WNT"
 .ENDIF			# "$(PATCH_FILE_NAME)"=="none" ||	"$(PATCH_FILE_NAME)"==""
 
diff --git a/solenv/inc/unitools.mk b/solenv/inc/unitools.mk
index 70df77727036..798dd55dd757 100644
--- a/solenv/inc/unitools.mk
+++ b/solenv/inc/unitools.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: unitools.mk,v $
 #
-#   $Revision: 1.10 $
+#   $Revision: 1.11 $
 #
-#   last change: $Author: hjs $ $Date: 2001-09-21 16:45:47 $
+#   last change: $Author: hjs $ $Date: 2001-11-07 13:23:52 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -126,8 +126,10 @@ COPY=cp -f
 COPYRECURSE=-r
 .IF "$(OS)"=="SOLARIS"
 GNUCOPY=gnucp
+GNUPATCH=gnupatch
 .ELSE			# "$(OS)"=="SOLARIS"
 GNUCOPY=cp
+GNUPATCH=patch
 .ENDIF			# "$(OS)"=="SOLARIS"
 .IF "$(OS)"=="LINUX"
 GNUMAKE=make