diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index bb2e14c56f..692f19a3a4 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,12 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-07-17 09:42 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * config/globsh.cf
+    ! Attempt to fix posix shell clean rules.
+      Please test. If the logic is about okay, we might want to
+      replicate it for other shells.
+
 2009-07-17 09:31 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * config/globsh.cf
     ! Minor fix dir creation to rules. (only create bin/lib target
diff --git a/harbour/config/globsh.cf b/harbour/config/globsh.cf
index e95b12b1cf..75798f9091 100644
--- a/harbour/config/globsh.cf
+++ b/harbour/config/globsh.cf
@@ -33,7 +33,23 @@ dirbase::
 	@[ -z $(EXE_FILE) ] || [ -d $(EXE_DIR) ] || $(MDP) $(EXE_DIR)
 
 clean::
-	-$(RD) $(OBJ_DIR) $(LIB_DIR) $(EXE_DIR)
+	-@$(RD) $(OBJ_DIR) $(LIB_FILE) $(EXE_FILE); \
+	if [ ! -z $(LIB_FILE) ]; \
+	then \
+	   $(RD) $(basename $(LIB_FILE)).bak; \
+	   if [ ! -f $(LIB_DIR)/* ]; \
+	   then \
+	      $(RD) $(LIB_DIR); \
+	   fi \
+	fi ; \
+	if [ ! -z $(EXE_FILE) ]; \
+	then \
+	   $(RD) $(basename $(EXE_FILE)).tds; \
+	   if [ ! -f $(EXE_DIR)/* ]; \
+	   then \
+	      $(RD) $(EXE_DIR); \
+	   fi \
+	fi
 
 endif