diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index fa34a152c3..08204f974c 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,10 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-07-14 20:10 UTC+0200 Lorenzo Fiorini (lorenzo.fiorini/at/gmail.com)
+  * bin/hb-func.sh
+    * add creation of unver harbour dll links in win/wce builds
+
 2009-07-14 18:53 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * config/win/pocc.cf
     + Added /subsystem:console to avoid linker warning.
diff --git a/harbour/bin/hb-func.sh b/harbour/bin/hb-func.sh
index 6297831c2e..b0c6176511 100755
--- a/harbour/bin/hb-func.sh
+++ b/harbour/bin/hb-func.sh
@@ -913,9 +913,12 @@ mk_hblibso()
         then
             if [ "${HB_ARCHITECTURE}" = "win" ] || \
                [ "${HB_ARCHITECTURE}" = "wce" ]; then
+                ll=${l%-${hb_ver}${lib_ext}}${lib_ext}
+                ln -sf $l $ll
                 if [ "${HB_XBUILD}" = "" ]; then
                    (cd "$dir"
-                   mv "${HB_LIB_INSTALL}/$l" "${HB_BIN_INSTALL}")
+                   mv "${HB_LIB_INSTALL}/$l" "${HB_BIN_INSTALL}"
+                   mv "${HB_LIB_INSTALL}/$ll" "${HB_BIN_INSTALL}")
                 fi
             else
                 if [ "${HB_ARCHITECTURE}" = "darwin" ]; then
diff --git a/harbour/contrib/hbqt/tests/demoqt.prg b/harbour/contrib/hbqt/tests/demoqt.prg
index 85c5ded884..59f775cccc 100644
--- a/harbour/contrib/hbqt/tests/demoqt.prg
+++ b/harbour/contrib/hbqt/tests/demoqt.prg
@@ -726,7 +726,7 @@ STATIC FUNCTION Dummies()
 
    RETURN nil
 
-/*----------------------------------------------------------------------*/
+function UIDEBUG(); return nil
 
 FUNCTION ShowInSystemTray( oWnd )
    LOCAL oSys