diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index dce55dcf49..7fbf1e50d6 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,17 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-02-24 19:33 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * config/globsh.mk
+    ! make the clean target also remove the newly-created libharbour* symlinks [Tamas]
+
+  * utils/hbmk2/hbmk2.prg
+    + Added TODO to eventually delete lib grouping.
+
+  * config/linux/watcom.mk
+    - Disabled dynlib creation on linux/watcom, because watcom support
+      is broken yet.
+
 2011-02-23 10:58 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * config/linux/sunpro.mk
   * config/sunos/gcc.mk
diff --git a/harbour/config/globsh.mk b/harbour/config/globsh.mk
index a91461c849..963dd0f518 100644
--- a/harbour/config/globsh.mk
+++ b/harbour/config/globsh.mk
@@ -72,6 +72,8 @@ clean::
 	   $(RM) $(basename $(DYN_FILE)).ilk; \
 	   $(RM) $(basename $(DYN_FILE)).def; \
 	   $(RM) $(basename $(DYN_FILE)).exp; \
+	   $(RM) $(DYN_FILE_NVR); \
+	   $(RM) $(DYN_FILE_CPT); \
 	   [ "`$(ECHO) $(DYN_DIR)/*`" != "$(DYN_DIR)/*" ] || $(RDP) $(DYN_DIR); \
 	fi ; \
 	if [ -n "$(IMP_FILE)" ]; then \
diff --git a/harbour/config/linux/watcom.mk b/harbour/config/linux/watcom.mk
index 2edf1a6752..d0bee81dfd 100644
--- a/harbour/config/linux/watcom.mk
+++ b/harbour/config/linux/watcom.mk
@@ -58,22 +58,22 @@ LDFLAGS += SYS linux
 LDLIBS := $(HB_USER_LIBS)
 LDLIBS += $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib))
 
-DY := $(LD)
-DFLAGS += OP quiet FORM elf dll LIBPATH $(WATCOM)/lib386 LIBPATH $(WATCOM)/lib386/linux OP exportall
-DY_OUT :=
-DLIBS :=
-
-# NOTE: The empty line directly before 'endef' HAVE TO exist!
-define dynlib_object
-   @$(ECHO) $(ECHOQUOTE)FILE '$(file)'$(ECHOQUOTE) >> __dyn__.tmp
-
-endef
-define create_dynlib
-   $(if $(wildcard __dyn__.tmp),@$(RM) __dyn__.tmp,)
-   $(foreach file,$^,$(dynlib_object))
-   $(DY) $(DFLAGS) $(HB_USER_DFLAGS) NAME '$(subst /,$(DIRSEP),$(DYN_DIR)/$@)' @__dyn__.tmp && $(LN) $(@F) $(DYN_FILE_NVR) && $(LN) $(@F) $(DYN_FILE_CPT)
-endef
-
-DY_RULE = $(create_dynlib)
+#DY := $(LD)
+#DFLAGS += OP quiet FORM elf dll LIBPATH $(WATCOM)/lib386 LIBPATH $(WATCOM)/lib386/linux OP exportall
+#DY_OUT :=
+#DLIBS :=
+#
+## NOTE: The empty line directly before 'endef' HAVE TO exist!
+#define dynlib_object
+#   @$(ECHO) $(ECHOQUOTE)FILE '$(file)'$(ECHOQUOTE) >> __dyn__.tmp
+#
+#endef
+#define create_dynlib
+#   $(if $(wildcard __dyn__.tmp),@$(RM) __dyn__.tmp,)
+#   $(foreach file,$^,$(dynlib_object))
+#   $(DY) $(DFLAGS) $(HB_USER_DFLAGS) NAME '$(subst /,$(DIRSEP),$(DYN_DIR)/$@)' @__dyn__.tmp && $(LN) $(@F) $(DYN_FILE_NVR) && $(LN) $(@F) $(DYN_FILE_CPT)
+#endef
+#
+#DY_RULE = $(create_dynlib)
 
 include $(TOP)$(ROOT)config/common/watcom.mk
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 87aad20fb9..296aa23e47 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -111,6 +111,8 @@
          autodetection of watcom cross-build setups, poccarm/pocc64 setups,
          clang, etc. */
 
+/* TODO: Turn off lib grouping by default */
+
 /* TODO: Use hashes instead of arrays for input files, options */
 /* TODO: Avoid adding certain options and input files twice */