diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index f3eb641619..cea0ca517a 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,18 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-04-17 05:13 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * INSTALL
+    - Deleted HB_BUILD_WINUNI option. It's not documented
+      option anymore. Pls don't use it. Use UNICOWS solution
+      if you need Win9x/ME support. Pls also note that _building Harbour_
+      on Win9x/ME systems is deprecated (as it is only possible
+      to build Harbour in non-UNICODE version in such scenario).
+
+  * config/global.mk
+    - Deleted some built-in build names which only differed
+      in WINUNI setting.
+
 2011-04-16 23:04 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbxbp/xbpfiledialog.prg
   * contrib/hbxbp/tests/xbpqtc.prg
diff --git a/harbour/INSTALL b/harbour/INSTALL
index 0aaa3e3b91..4ecb309ed7 100644
--- a/harbour/INSTALL
+++ b/harbour/INSTALL
@@ -703,14 +703,6 @@ HARBOUR
    - HB_BUILD_NOGPLLIB=yes       Disable components dependent on GPL 3rd party code,
                                  to allow Harbour for commercial (closed-source)
                                  projects. Default: no
-   - HB_BUILD_WINUNI=yes         For Windows targets only.
-                                 If enabled, it will make Harbour use the Unicode
-                                 ("wide") flavor of Windows API calls. If you need
-                                 your app to run on Win9x/ME systems, either disable
-                                 this option, or use UNICOWS solution (recommended).
-                                 Default: yes. (For Windows CE targets this is the
-                                 only accepted setting, any user override is ignored.
-                                 When building on Win9x/ME host, the default is 'no'.)
    - HB_BUILD_3RDEXT=no          Enable autodetection of 3rd party components
                                  on default system locations. Default: yes
    - HB_BUILD_CONTRIBS=no [<l>]  Don't build any (or space separated <l> list of)
diff --git a/harbour/config/global.mk b/harbour/config/global.mk
index 831560c6b8..84d0568a78 100644
--- a/harbour/config/global.mk
+++ b/harbour/config/global.mk
@@ -92,54 +92,22 @@ ifneq ($(HB_BUILD_NAME),)
    ifeq ($(HB_BUILD_NAME),.r)
       HB_BUILD_DEBUG := no
       HB_BUILD_OPTIM := yes
-      HB_BUILD_WINUNI := no
-      HB_BUILD_MODE ?= c
-   else
-   ifeq ($(HB_BUILD_NAME),.ru)
-      HB_BUILD_DEBUG := no
-      HB_BUILD_OPTIM := yes
-      HB_BUILD_WINUNI := yes
       HB_BUILD_MODE ?= c
    else
    ifeq ($(HB_BUILD_NAME),.rp)
       HB_BUILD_DEBUG := no
       HB_BUILD_OPTIM := yes
-      HB_BUILD_WINUNI := no
-      HB_BUILD_MODE ?= cpp
-   else
-   ifeq ($(HB_BUILD_NAME),.rpu)
-      HB_BUILD_DEBUG := no
-      HB_BUILD_OPTIM := yes
-      HB_BUILD_WINUNI := yes
       HB_BUILD_MODE ?= cpp
    else
    ifeq ($(HB_BUILD_NAME),.d)
       HB_BUILD_DEBUG := yes
       HB_BUILD_OPTIM := no
-      HB_BUILD_WINUNI := no
-      HB_BUILD_MODE ?= c
-   else
-   ifeq ($(HB_BUILD_NAME),.du)
-      HB_BUILD_DEBUG := yes
-      HB_BUILD_OPTIM := no
-      HB_BUILD_WINUNI := yes
       HB_BUILD_MODE ?= c
    else
    ifeq ($(HB_BUILD_NAME),.dp)
       HB_BUILD_DEBUG := yes
       HB_BUILD_OPTIM := no
-      HB_BUILD_WINUNI := no
       HB_BUILD_MODE ?= cpp
-   else
-   ifeq ($(HB_BUILD_NAME),.dpu)
-      HB_BUILD_DEBUG := yes
-      HB_BUILD_OPTIM := no
-      HB_BUILD_WINUNI := yes
-      HB_BUILD_MODE ?= cpp
-   endif
-   endif
-   endif
-   endif
    endif
    endif
    endif