diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 3401030873..e8f4e02da8 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,21 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-08-22 10:21 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * config/rules.mk
+  * config/dyn.mk
+    ! Fixed to handle dynamic lib creation gracefully for targets
+      where this isn't supported. Now a message will be shown.
+
+  + config/os2-cp.exe
+  * config/readme.txt
+    + Added os2 cp tool. For testing.
+
+  * source/pp/Makefile
+  * source/dynlib/mt/Makefile
+  * source/dynlib/Makefile
+    * Minor rename.
+
 2009-08-22 10:00 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * config/wce/mingwarm.mk
   * config/win/mingw.mk
diff --git a/harbour/config/dyn.mk b/harbour/config/dyn.mk
index 0948955938..91d8f27379 100644
--- a/harbour/config/dyn.mk
+++ b/harbour/config/dyn.mk
@@ -28,14 +28,12 @@ descend:: dirbase
 	+@$(MK) $(MKFLAGS) -C $(OBJ_DIR) -f $(GRANDP)Makefile TOP=$(GRANDP) $(DYN_NAME)
 
 ifneq ($(HB_BUILD_DLL),no)
-ifneq ($(DY_RULE),)
 
 vpath $(DYN_NAME) $(DYN_DIR)
 $(DYN_NAME) : $(ALL_OBJS)
 	$(DY_RULE)
 
 endif
-endif
 
 INSTALL_FILES := $(DYN_FILE)
 INSTALL_DIR := $(HB_DYN_INSTALL)
diff --git a/harbour/config/os2-cp.exe b/harbour/config/os2-cp.exe
new file mode 100644
index 0000000000..1fa28b1dc7
Binary files /dev/null and b/harbour/config/os2-cp.exe differ
diff --git a/harbour/config/readme.txt b/harbour/config/readme.txt
index 8af6e989c4..cff9db60b1 100644
--- a/harbour/config/readme.txt
+++ b/harbour/config/readme.txt
@@ -37,7 +37,7 @@ Included utilities are:
              ftp://ftp.delorie.com/pub/djgpp/current/v2gnu/fil41s.zip
              ftp://ftp.delorie.com/pub/djgpp/current/v2/djdev203.zip
              ftp://ftp.delorie.com/pub/djgpp/current/v2/djlsr203.zip
-        - OS/2 (os2-mkdir.exe, os2-rm.exe)
+        - OS/2 (os2-mkdir.exe, os2-rm.exe, os2-cp.exe)
              http://os2ports.smedley.info/index.php?page=build-environment
              http://download.smedley.info/buildenv_20071022.zip
              (couldn't find the sources here)
diff --git a/harbour/config/rules.mk b/harbour/config/rules.mk
index 917eb3b382..fe28cccddd 100644
--- a/harbour/config/rules.mk
+++ b/harbour/config/rules.mk
@@ -59,7 +59,7 @@ endif
 
 # The rule to link a dynamic library.
 ifeq ($(DY_RULE),)
-#  DY_RULE = $(DY) $(DY_OUT)$(subst /,$(DIRSEP),$(DYN_DIR)/$@) $^ $(DFLAGS) $(HB_USER_DFLAGS) $(DLIBS)
+   DY_RULE = @$(ECHO) $(ECHOQUOTE)! Dynamic library creation not supported for this target$(ECHOQUOTE)
 endif
 
 # Eliminate these rules.
@@ -91,11 +91,9 @@ endif
 	$(HB_RULE)
 
 ifneq ($(HB_BUILD_DLL),no)
-ifneq ($(DY_RULE),)
 
 # Rule to generate an dynamic library from an object file.
 %$(DYN_EXT) : %$(OBJ_DYN_POSTFIX)$(OBJ_EXT)
 	$(DY_RULE)
 
 endif
-endif
diff --git a/harbour/source/dynlib/Makefile b/harbour/source/dynlib/Makefile
index 3b9ec7e311..d0999cad11 100644
--- a/harbour/source/dynlib/Makefile
+++ b/harbour/source/dynlib/Makefile
@@ -17,7 +17,7 @@ ifneq ($(DYNDIRLIST_BASE),)
       include $(TOP)$(ROOT)config/dyn.mk
       include $(TOP)$(ROOT)config/dir.mk
 
-      INSTALL_RULE_LIBRARIES := $(INSTALL_RULE)
+      INSTALL_RULE_DYN := $(INSTALL_RULE)
 
       ifneq ($(HB_LIB_INSTALL),)
          INSTALL_FILES := $(IMP_FILE)
@@ -27,7 +27,7 @@ ifneq ($(DYNDIRLIST_BASE),)
       endif
 
 install::
-	$(INSTALL_RULE_LIBRARIES)
+	$(INSTALL_RULE_DYN)
 
    else
       include $(TOP)$(ROOT)config/none.mk
diff --git a/harbour/source/dynlib/mt/Makefile b/harbour/source/dynlib/mt/Makefile
index 87a1e5c7ce..7fc4ab4d1c 100644
--- a/harbour/source/dynlib/mt/Makefile
+++ b/harbour/source/dynlib/mt/Makefile
@@ -14,7 +14,7 @@ ifneq ($(DYNDIRLIST_BASE),)
 
       include $(TOP)$(ROOT)config/dyn.mk
 
-      INSTALL_RULE_LIBRARIES := $(INSTALL_RULE)
+      INSTALL_RULE_DYN := $(INSTALL_RULE)
 
       ifneq ($(HB_LIB_INSTALL),)
          INSTALL_FILES := $(IMP_FILE)
@@ -24,7 +24,7 @@ ifneq ($(DYNDIRLIST_BASE),)
       endif
 
 install::
-	$(INSTALL_RULE_LIBRARIES)
+	$(INSTALL_RULE_DYN)
 
    else
       include $(TOP)$(ROOT)config/none.mk
diff --git a/harbour/source/pp/Makefile b/harbour/source/pp/Makefile
index 12b66f009b..446e37efa6 100644
--- a/harbour/source/pp/Makefile
+++ b/harbour/source/pp/Makefile
@@ -22,7 +22,7 @@ include $(TOP)$(ROOT)config/lib.mk
 ifneq ($(HB_ARCHITECTURE),)
 ifneq ($(HB_COMPILER),)
 
-INSTALL_RULE_LIBRARIES := $(INSTALL_RULE)
+INSTALL_RULE_LIB := $(INSTALL_RULE)
 
 HB_VERHEADER := $(TOP)$(ROOT)include/hbverbld.h
 
@@ -47,7 +47,7 @@ ifneq ($(HB_HOST_BUILD),lib)
 endif
 
 install::
-	$(INSTALL_RULE_LIBRARIES)
+	$(INSTALL_RULE_LIB)
 
 clean::
 	$(if $(wildcard $(HB_VERHEADER)), -@$(RM) $(subst /,$(DIRSEP),$(HB_VERHEADER)),)