diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 63de16b1bf..7e3c23cf92 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,13 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-08-27 20:15 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * config/bsd/gcc.mk
+  * config/hpux/gcc.mk
+    ! Restored cmdline lenght saver trick for BSD and HPUX after
+      giving this http://www.in-ulm.de/~mascheck/various/argmax/
+      a bit more careful read.
+
 2009-08-27 20:03 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * config/linux/libs.mk
     ! Deleted some stuff left when doing the copy from
diff --git a/harbour/config/bsd/gcc.mk b/harbour/config/bsd/gcc.mk
index 9ec8dc847f..15fe1292aa 100644
--- a/harbour/config/bsd/gcc.mk
+++ b/harbour/config/bsd/gcc.mk
@@ -49,6 +49,17 @@ DFLAGS := -shared -fPIC $(foreach dir,$(SYSLIBPATHS),-L$(dir))
 DY_OUT := -o$(subst x,x, )
 DLIBS := $(foreach lib,$(SYSLIBS),-l$(lib))
 
-DY_RULE = $(DY) $(DFLAGS) $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ $^ $(DLIBS)
+# NOTE: The empty line directly before 'endef' HAVE TO exist!
+define dyn_object
+   @$(ECHO) $(ECHOQUOTE)INPUT($(subst \,/,$(file)))$(ECHOQUOTE) >> __dyn__.tmp
+
+endef
+define create_dynlib
+   $(if $(wildcard __dyn__.tmp),@$(RM) __dyn__.tmp,)
+   $(foreach file,$^,$(dyn_object))
+   $(DY) $(DFLAGS) $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ __dyn__.tmp $(DLIBS)
+endef
+
+DY_RULE = $(create_dynlib)
 
 include $(TOP)$(ROOT)config/rules.mk
diff --git a/harbour/config/hpux/gcc.mk b/harbour/config/hpux/gcc.mk
index d4de5a2532..fcb407d08a 100644
--- a/harbour/config/hpux/gcc.mk
+++ b/harbour/config/hpux/gcc.mk
@@ -55,6 +55,17 @@ DFLAGS := -shared -fPIC $(foreach dir,$(SYSLIBPATHS),-L$(dir))
 DY_OUT := -o$(subst x,x, )
 DLIBS := $(foreach lib,$(SYSLIBS),-l$(lib))
 
-DY_RULE = $(DY) $(DFLAGS) $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ $^ $(DLIBS)
+# NOTE: The empty line directly before 'endef' HAVE TO exist!
+define dyn_object
+   @$(ECHO) $(ECHOQUOTE)INPUT($(subst \,/,$(file)))$(ECHOQUOTE) >> __dyn__.tmp
+
+endef
+define create_dynlib
+   $(if $(wildcard __dyn__.tmp),@$(RM) __dyn__.tmp,)
+   $(foreach file,$^,$(dyn_object))
+   $(DY) $(DFLAGS) $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ __dyn__.tmp $(DLIBS)
+endef
+
+DY_RULE = $(create_dynlib)
 
 include $(TOP)$(ROOT)config/rules.mk