diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index abd8f18c17..7fcec3673f 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,19 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+       - Preprocessor (PP) lib flavour is not affected by this setting.
+       - Support is not full in the RDD code yet.
+
+   * harbour/source/rdd/dbf1.c
+   * harbour/source/rdd/dblist.prg
+   * harbour/source/rdd/delim1.c
+   * harbour/source/rdd/sdf1.c
+   * harbour/source/rtl/tlabel.prg
+   * harbour/source/rtl/treport.prg
+   * harbour/source/rtl/set.c
+   * harbour/source/vm/memvars.c
+   * harbour/source/vm/runner.c
+     + Honoring _SET_DEFEXTENSIONS setting all over the code.
 
 2006-09-05 12:44 UTC+0100 Viktor Szakats (viktor.szakats syenar.hu)
    * harbour/source/debug/debugger.prg
diff --git a/harbour/harbour.spec b/harbour/harbour.spec
index 5d80e41805..c0cdea0093 100644
--- a/harbour/harbour.spec
+++ b/harbour/harbour.spec
@@ -419,8 +419,8 @@ function main()
 return nil
 
 druzus@uran:~/tmp$ %{hb_pref}cmp foo
-xHarbour Compiler build 0.80.0 (SimpLex)
-Copyright 1999-2003, http://www.xharbour.org http://www.harbour-project.org/
+Harbour Compiler Alpha build 46.2 (Flex)
+Copyright 1999-2006, http://www.harbour-project.org/
 Compiling 'foo.prg'...
 Lines 5, Functions/Procedures 2
 Generating C source output to 'foo.c'... Done.
@@ -441,8 +441,8 @@ function main()
 return nil
 
 druzus@uran:~/tmp$ %{hb_pref}mk foo
-xHarbour Compiler build 0.80.0 (SimpLex)
-Copyright 1999-2003, http://www.xharbour.org http://www.harbour-project.org/
+Harbour Compiler Alpha build 46.2 (Flex)
+Copyright 1999-2006, http://www.harbour-project.org/
 Compiling 'foo.prg'...
 Lines 5, Functions/Procedures 2
 Generating C source output to 'foo.c'... Done.
diff --git a/harbour/make_bsd.sh b/harbour/make_bsd.sh
index cabd0bef44..af3b3d4bba 100644
--- a/harbour/make_bsd.sh
+++ b/harbour/make_bsd.sh
@@ -28,8 +28,8 @@ if [ -z "$HB_MT" ]; then export HB_MT=MT; fi
 export PREFIX=/usr/local
 
 if [ -z "$HB_BIN_INSTALL" ]; then export HB_BIN_INSTALL=$PREFIX/bin/; fi
-if [ -z "$HB_LIB_INSTALL" ]; then export HB_LIB_INSTALL=$PREFIX/lib/xharbour/; fi
-if [ -z "$HB_INC_INSTALL" ]; then export HB_INC_INSTALL=$PREFIX/include/xharbour/; fi
+if [ -z "$HB_LIB_INSTALL" ]; then export HB_LIB_INSTALL=$PREFIX/lib/harbour/; fi
+if [ -z "$HB_INC_INSTALL" ]; then export HB_INC_INSTALL=$PREFIX/include/harbour/; fi
 
 if [ -z "$HB_ARCHITECTURE" ]; then
    echo "Error: HB_ARCHITECTURE is not set."
diff --git a/harbour/make_drw.sh b/harbour/make_drw.sh
index e5f924d32b..6b6baabcf3 100644
--- a/harbour/make_drw.sh
+++ b/harbour/make_drw.sh
@@ -24,7 +24,7 @@ if [ -z "$HB_GT_LIB" ]; then export HB_GT_LIB=gtstd; fi
 # Set to constant value to be consistent with the non-GNU make files.
 
 if [ -z "$HB_BIN_INSTALL" ]; then export HB_BIN_INSTALL=$PREFIX/bin/; fi
-if [ -z "$HB_LIB_INSTALL" ]; then export HB_LIB_INSTALL=$PREFIX/lib/xharbour/; fi
-if [ -z "$HB_INC_INSTALL" ]; then export HB_INC_INSTALL=$PREFIX/include/xharbour/; fi
+if [ -z "$HB_LIB_INSTALL" ]; then export HB_LIB_INSTALL=$PREFIX/lib/harbour/; fi
+if [ -z "$HB_INC_INSTALL" ]; then export HB_INC_INSTALL=$PREFIX/include/harbour/; fi
 
 . `dirname $0`/make_gnu.sh $*
diff --git a/harbour/make_xmingw.sh b/harbour/make_xmingw.sh
index f9220baa4d..6787620e55 100644
--- a/harbour/make_xmingw.sh
+++ b/harbour/make_xmingw.sh
@@ -3,7 +3,7 @@
 #
 # $Id$
 #
-# This script simplifies cross-compiling xHarbour for Windows from Unix systems.
+# This script simplifies cross-compiling Harbour for Windows from Unix systems.
 #
 # Copyright 2003-2005 by Phil Krylov <phil a t newstar.rinet.ru>
 #
diff --git a/harbour/source/debug/debugger.prg b/harbour/source/debug/debugger.prg
index a653f79f9c..99952c2721 100644
--- a/harbour/source/debug/debugger.prg
+++ b/harbour/source/debug/debugger.prg
@@ -1831,8 +1831,8 @@ return nil
 
 //METHOD ShowCodeLine( nLine, cPrgName ) CLASS TDebugger
 METHOD ShowCodeLine( nProc ) CLASS TDebugger
-LOCAL nPos
-LOCAL nLine, cPrgName
+   LOCAL nLine, cPrgName
+   LOCAL cDir, cName, cExt
 
    // we only update the stack window and up a new browse
    // to view the code if we have just broken execution
@@ -1854,12 +1854,8 @@ LOCAL nLine, cPrgName
       ENDIF
       
       if( ::lppo )
-         nPos :=RAT(".PRG", UPPER(cPrgName) ) 
-         IF( nPos > 0 )
-            cPrgName := LEFT( cPrgName, nPos-1 ) + ".ppo"
-         ELSE
-            cPrgName += cPrgName +".ppo"
-         ENDIF
+         hb_FNameSplit( cPrgName, @cDir, @cName, @cExt )
+         cPrgName := hb_FNameMerge( cDir, cName, ".ppo" )
       endif
 
       if ! empty( cPrgName )
@@ -1900,6 +1896,7 @@ return nil
 
 METHOD Open() CLASS TDebugger
    LOCAL cFileName := AllTrim( ::InputBox( "Please enter the filename", Space( 255 ) ) )
+   LOCAL cExt
 
    if !EMPTY(cFileName) .AND. (cFileName != ::cPrgName .OR. valtype(::cPrgName)=='U')
       if ! File( cFileName ) .and. ! Empty( ::cPathForFiles )
@@ -1910,7 +1907,8 @@ METHOD Open() CLASS TDebugger
          endif
       endif
       ::cPrgName := cFileName
-      ::lppo := RAT(".PPO", UPPER(cFileName)) > 0
+      hb_FNameSplit( cFileName, NIL, NIL, @cExt )
+      ::lppo := ( Lower( cExt ) == ".ppo" )
       ::oPulldown:GetItemByIdent( "PPO" ):Checked := ::lppo
       ::oBrwText := nil
       ::oBrwText := TBrwText():New( ::oWndCode:nTop + 1, ::oWndCode:nLeft + 1,;
@@ -1926,26 +1924,22 @@ METHOD Open() CLASS TDebugger
 return nil
 
 METHOD OpenPPO() CLASS TDebugger
-   LOCAL nPos
-   LOCAL lSuccess:=.F.
+   LOCAL lSuccess
+   LOCAL cDir, cName, cExt
 
-   nPos := RAT(".PPO", UPPER(::cPrgName))
-   IF( nPos == 0 )
-      nPos := RAT(".PRG", UPPER(::cPrgName))
-      IF( nPos > 0 )
-         ::cPrgName := LEFT(::cPrgName,nPos-1) + ".ppo"
-      ELSE
-         ::cPrgName += ".ppo"
-      ENDIF
-      lSuccess := FILE(::cPrgName)
-      ::lppo := lSuccess
-   ELSE
-      ::cPrgName := LEFT(::cPrgName,nPos-1) + ".prg"
+   hb_FNameSplit( ::cPrgName, @cDir, @cName, @cExt )
+
+   IF Lower( cExt ) == ".ppo"
+      ::cPrgName := hb_FNameMerge( cDir, cName, ".prg" )
       lSuccess := FILE( ::cPrgName )
       ::lppo := !lSuccess
+   ELSE
+      ::cPrgName := hb_FNameMerge( cDir, cName, ".ppo" )
+      lSuccess := FILE( ::cPrgName )
+      ::lppo := lSuccess
    ENDIF
    
-   IF( lSuccess )
+   IF lSuccess
       ::oBrwText := nil
       ::oBrwText := TBrwText():New( ::oWndCode:nTop + 1, ::oWndCode:nLeft + 1,;
                    ::oWndCode:nBottom - 1, ::oWndCode:nRight - 1, ::cPrgName,;
diff --git a/harbour/source/vm/memvars.c b/harbour/source/vm/memvars.c
index ac5a6b64cd..824c4c40f1 100644
--- a/harbour/source/vm/memvars.c
+++ b/harbour/source/vm/memvars.c
@@ -1252,7 +1252,7 @@ static HB_DYNS_FUNC( hb_memvarSave )
    BYTE * buffer     = ( ( MEMVARSAVE_CARGO * ) Cargo )->buffer;
    FHANDLE fhnd      = ( ( MEMVARSAVE_CARGO * ) Cargo )->fhnd;
 
-   /* NOTE: Harbour name lengths are not limited, but the .MEM file
+   /* NOTE: Harbour name lengths are not limited, but the .mem file
             structure is not flexible enough to allow for it.
             [vszakats] */
 
@@ -1362,7 +1362,7 @@ HB_FUNC( __MVSAVE )
       hb_fsFNameMerge( szFileName, pFileName );
       hb_xfree( pFileName );
 
-      /* Create .MEM file */
+      /* Create .mem file */
 
       do
       {
@@ -1432,7 +1432,7 @@ HB_FUNC( __MVRESTORE )
       hb_fsFNameMerge( szFileName, pFileName );
       hb_xfree( pFileName );
 
-      /* Open .MEM file */
+      /* Open .mem file */
 
       do
       {