diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 1862d16736..13184fd277 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,18 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-06-25 13:52 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbxbp/tests/demoxbp.prg
+    ! Fixed the same warning again.
+    * Changed to actually close the window when using close icon
+      or Alt+F4.
+    ; Thanks Priptal for the close fix, GPF is now gone.
+
+  * mpkg_gnu.bat
+    ! Using shorter temp dir names to make DOS command.com happy,
+      so that it copies all libs with a little more chance.
+      It's recommended to use a short base dir for DOS builds.
+
 2009-06-25 13:09 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbfimage/fi_wrp.c
   * contrib/hbgd/gdwrp.c
diff --git a/harbour/contrib/hbxbp/tests/demoxbp.prg b/harbour/contrib/hbxbp/tests/demoxbp.prg
index 22df722200..939a732259 100644
--- a/harbour/contrib/hbxbp/tests/demoxbp.prg
+++ b/harbour/contrib/hbxbp/tests/demoxbp.prg
@@ -71,7 +71,7 @@ PROCEDURE BuildADialog()
 
    /* Create Application Window */
    oDlg := GuiStdDialog( 'Harbour - Xbase++ - QT Dialog [ Press "Q" to Exit ]' )
-   oDlg:close := {|| MsgBox( 'You can also close me by Pressing "Q"' ), .f. }
+   oDlg:close := {|| MsgBox( 'You can also close me by Pressing "Q"' ), .T. }
 
    SetAppWindow( oDlg )
 
@@ -675,7 +675,7 @@ FUNCTION Build_TreeView( oWnd )
       WorkAreaInfo( oTree, i )
    NEXT
 
-   RETURN
+   RETURN nil
 
    ** Build the tree structure for a work area
 
diff --git a/harbour/mpkg_gnu.bat b/harbour/mpkg_gnu.bat
index 263270911d..4316981251 100644
--- a/harbour/mpkg_gnu.bat
+++ b/harbour/mpkg_gnu.bat
@@ -30,7 +30,7 @@ if not "%OS%" == "Windows_NT" goto END
 setlocal
 
 rem ; Dir setup
-set HB_INSTALL_BASE=%~dp0_hbinst
+set HB_INSTALL_BASE=%~dp0_pk
 set HB_INSTALL_PREFIX=%HB_INSTALL_BASE%\_w
 set HB_BIN_INSTALL=
 set HB_LIB_INSTALL=