diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 957b619fb3..e0a46484be 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,15 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-07-16 20:37 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * config/globsh.cf
+    + Reworked 'clean' rules. Now whole bin/obj/lib dirs should
+      disappear with any .tds files in them.
+      OS/2 shell is the only black sheep here, I've updated it,
+      but since I cannot try it, it may not work.
+    % Deleted MV variable. Not used in Harbour.
+    + Added MDP variable for nt.
+
 2009-07-16 20:02 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * bin/postinst.bat
     ! Fixed for MS-DOS. Again.
@@ -319,7 +328,7 @@
   * config/install.cf
   + config/instsh.cf
     ! Fixed NT vs dos shell detection. (hopefully)
-    + Shell dependent logic merged and moved into new *_sh.cf
+    + Shell dependent logic merged and moved into new *sh.cf
       files. The filename is ugly, but couldn't yet find a better one.
       This means a great deal of redundancy is now removed, plus
       now cross-platform combinations aren't limited by missing
diff --git a/harbour/config/globsh.cf b/harbour/config/globsh.cf
index edd8dff071..ce697be074 100644
--- a/harbour/config/globsh.cf
+++ b/harbour/config/globsh.cf
@@ -12,11 +12,9 @@ ifneq ($(HB_SHELL),bash)
 
 DIRSEP = $(subst /,\,\)
 
-OBJ_DIR_OS  = $(subst /,\,$(OBJ_DIR))
-LIB_DIR_OS  = $(subst /,\,$(LIB_DIR))
-LIB_FILE_OS = $(subst /,\,$(LIB_FILE))
-EXE_DIR_OS  = $(subst /,\,$(EXE_DIR))
-EXE_FILE_OS = $(subst /,\,$(EXE_FILE))
+OBJ_DIR_OS = $(subst /,\,$(OBJ_DIR))
+LIB_DIR_OS = $(subst /,\,$(LIB_DIR))
+EXE_DIR_OS = $(subst /,\,$(EXE_DIR))
 
 endif
 
@@ -26,7 +24,6 @@ MK = $(MAKE)
 RM = rm -f
 RD = rm -f -r
 CP = cp -f
-MV = mv -f
 MD = mkdir
 MDP = mkdir -p
 
@@ -36,7 +33,7 @@ dirbase::
 	@[ -z $(EXE_DIR) ] || [ -d $(EXE_DIR) ] || $(MDP) $(EXE_DIR)
 
 clean::
-	-$(RD) $(OBJ_DIR) $(LIB_FILE) $(EXE_FILE) $(basename $(EXE_FILE)).tds
+	-$(RD) $(OBJ_DIR) $(LIB_DIR) $(EXE_DIR)
 
 endif
 
@@ -46,19 +43,18 @@ MK = $(subst \,/,$(subst \~,~,$(MAKE)))
 RM = del /q /f
 RD = rmdir /q /s
 CP = $(CMDPREF)copy
-MV = move
 MD = mkdir
+MDP = mkdir
 
 dirbase::
-	-@$(CMDPREF)if not exist $(OBJ_DIR_OS) $(MD) $(OBJ_DIR_OS)
-	$(if $(LIB_DIR_OS),-@$(CMDPREF)if not exist $(LIB_DIR_OS) $(MD) $(LIB_DIR_OS),)
-	$(if $(EXE_DIR_OS),-@$(CMDPREF)if not exist $(EXE_DIR_OS) $(MD) $(EXE_DIR_OS),)
+	-@$(CMDPREF)if not exist $(OBJ_DIR_OS) $(MDP) "$(OBJ_DIR_OS)"
+	$(if $(LIB_DIR_OS),-@$(CMDPREF)if not exist "$(LIB_DIR_OS)" $(MDP) "$(LIB_DIR_OS)",)
+	$(if $(EXE_DIR_OS),-@$(CMDPREF)if not exist "$(EXE_DIR_OS)" $(MDP) "$(EXE_DIR_OS)",)
 
 clean::
-	-@$(CMDPREF)if exist $(OBJ_DIR_OS) $(RD) $(OBJ_DIR_OS)
-	$(if $(LIB_FILE_OS),-@$(CMDPREF)if exist $(LIB_FILE_OS) $(RM) $(LIB_FILE_OS),)
-	$(if $(EXE_FILE_OS),-@$(CMDPREF)if exist $(EXE_FILE_OS) $(RM) $(EXE_FILE_OS),)
-	$(if $(EXE_FILE_OS),-@$(CMDPREF)if exist $(basename $(EXE_FILE_OS)).tds $(MD) $(basename $(EXE_FILE_OS)).tds,)
+	-@$(CMDPREF)if exist $(OBJ_DIR_OS) $(RD) "$(OBJ_DIR_OS)"
+	$(if $(LIB_DIR_OS),-@$(CMDPREF)if exist "$(LIB_DIR_OS)" $(RD) "$(LIB_DIR_OS)",)
+	$(if $(EXE_DIR_OS),-@$(CMDPREF)if exist "$(EXE_DIR_OS)" $(RD) "$(EXE_DIR_OS)",)
 
 endif
 
@@ -68,9 +64,10 @@ MK = $(subst /,\,$(subst \~,~,$(MAKE)))
 RM = del /n
 RD = rmdir
 CP = $(CMDPREF)copy
-MV = move
 MD = mkdir
 
+LIB_FILE_OS     = $(subst /,\,$(LIB_FILE))
+EXE_FILE_OS     = $(subst /,\,$(EXE_FILE))
 OBJ_ARCH_DIR_OS = $(subst /,\,$(OBJ_ARCH_DIR))
 LIB_ARCH_DIR_OS = $(subst /,\,$(LIB_ARCH_DIR))
 EXE_ARCH_DIR_OS = $(subst /,\,$(EXE_ARCH_DIR))
@@ -83,9 +80,10 @@ dirbase::
 clean::
 	-if exist $(OBJ_DIR_OS)\*.* $(RM) $(OBJ_DIR_OS)\*.*
 	-for %d in ($(OBJ_DIR_OS) $(OBJ_ARCH_DIR_OS) $(OBJ_BASE)) do if exist %d $(RD) %d
-	$(if $(LIB_FILE_OS),-if exist $(LIB_FILE_OS) $(RM) $(LIB_FILE_OS),)
-	$(if $(EXE_FILE_OS),-if exist $(EXE_FILE_OS) $(RM) $(EXE_FILE_OS),)
-	$(if $(EXE_FILE_OS),-if exist $(basename $(EXE_FILE_OS)).tds $(RM) $(basename $(EXE_FILE_OS)).tds,)
+	$(if $(LIB_FILE_OS),-if exist $(LIB_DIR_OS)\*.* $(RM) $(LIB_DIR_OS)\*.*,)
+	$(if $(LIB_FILE_OS),-for %d in ($(LIB_DIR_OS) $(LIB_ARCH_DIR_OS)) do if exist %d $(RD) %d,)
+	$(if $(EXE_FILE_OS),-if exist $(EXE_DIR_OS)\*.* $(RM) $(EXE_DIR_OS)\*.*,)
+	$(if $(EXE_FILE_OS),-for %d in ($(EXE_DIR_OS) $(EXE_ARCH_DIR_OS)) do if exist %d $(RD) %d,)
 
 endif
 
@@ -97,7 +95,6 @@ MK = $(subst \,/,$(subst \~,~,$(MAKE)))
 RM = $(TOOL_DIR)dj-rm.exe -f
 RD = $(TOOL_DIR)dj-rm.exe -f -r
 CP = $(TOOL_DIR)dj-cp.exe -f
-MV = move
 MD = $(TOOL_DIR)dj-mkdir.exe
 MDP = $(TOOL_DIR)dj-mkdir.exe -p
 
@@ -107,6 +104,6 @@ dirbase::
 	$(if $(EXE_DIR_OS),-@$(CMDPREF)if not exist $(EXE_DIR_OS)\nul $(MDP) $(EXE_DIR_OS),)
 
 clean::
-	-@$(RM) $(OBJ_DIR_OS) $(LIB_FILE_OS) $(EXE_FILE_OS) $(basename $(EXE_FILE_OS)).tds
+	-@$(RD) $(OBJ_DIR_OS) $(LIB_DIR_OS) $(EXE_DIR_OS)
 
 endif