diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 58d0fa698a..5da46c71a8 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,27 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-06-27 14:06 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbcups/Makefile
+  * contrib/hbcups/hbcups.hbp
+    - Disabled for win, wce, dos. It's actually support by
+      win/mingw and win/cygwin, but it's not very useful plus
+      enabling it causes much more trouble than benefit at
+      this point.
+
+  * contrib/makefile.prg
+    * Install .dlls to bin dir.
+
+  * contrib/hbide/ideprojmanager.prg
+  * contrib/hbide/hbide.hbp
+  - contrib/hbide/resources/hbmk2_plugin_uip.prg
+  + contrib/hbide/resources/hbmk2_plugin_ui.prg
+    * Renamed for consistency.
+
+  * contrib/hbide/resources/hbmk2_plugin_ui.prg
+  * contrib/hbqt/hbmk2_plugin_moc.prg
+    * Minor cleanup.
+
 2010-06-26 16:17 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
   * contrib/hbqt/generator/hbqtgen.prg
   * contrib/hbqt/generator/qt45.qtp
diff --git a/harbour/contrib/hbcups/Makefile b/harbour/contrib/hbcups/Makefile
index a6fd6decc6..9e78b4c3c7 100644
--- a/harbour/contrib/hbcups/Makefile
+++ b/harbour/contrib/hbcups/Makefile
@@ -14,7 +14,7 @@ C_SOURCES := \
 _DET_DSP_NAME := cups
 _DET_VAR_INC_ := HB_INC_CUPS
 _DET_VAR_HAS_ := HB_HAS_CUPS
-_DET_FLT_PLAT :=
+_DET_FLT_PLAT := !win !wce !dos
 _DET_FLT_COMP :=
 _DET_INC_DEFP := /usr/include
 _DET_INC_HEAD := /cups/cups.h
diff --git a/harbour/contrib/hbcups/hbcups.hbp b/harbour/contrib/hbcups/hbcups.hbp
index 64ad388249..3742ba7357 100644
--- a/harbour/contrib/hbcups/hbcups.hbp
+++ b/harbour/contrib/hbcups/hbcups.hbp
@@ -10,6 +10,8 @@
 
 -w3 -es2
 
+-stop{win|wce|dos}
+
 -depkeyhead=cups:cups/cups.h
 -depcontrol=cups:${HB_WITH_CUPS}
 -depincpath=cups:/usr/include
diff --git a/harbour/contrib/hbide/hbide.hbp b/harbour/contrib/hbide/hbide.hbp
index 8abeb9dd0e..8fc6fdfd94 100644
--- a/harbour/contrib/hbide/hbide.hbp
+++ b/harbour/contrib/hbide/hbide.hbp
@@ -51,4 +51,4 @@ ideplugins.prg
 idedict.prg
 
 -pi=*.ui
--plugin=resources/hbmk2_plugin_uip.prg
+-plugin=resources/hbmk2_plugin_ui.prg
diff --git a/harbour/contrib/hbide/ideprojmanager.prg b/harbour/contrib/hbide/ideprojmanager.prg
index 2617cd1eb1..dae04385ed 100644
--- a/harbour/contrib/hbide/ideprojmanager.prg
+++ b/harbour/contrib/hbide/ideprojmanager.prg
@@ -1354,7 +1354,7 @@ METHOD IdeProjManager:buildProject( cProject, lLaunch, lRebuild, lPPO, lViaQt )
    aadd( aHbp, "-info"       )
    aadd( aHbp, "-lang=en"    )
    aadd( aHbp, "-width=512"  )
-   aadd( aHbp, "-plugin=" + hb_dirBase() + "resources/hbmk2_plugin_uip.prg" )
+   aadd( aHbp, "-plugin=" + hb_dirBase() + "resources/hbmk2_plugin_ui.prg" )
    IF lRebuild
       aadd( aHbp, "-rebuild" )
    ENDIF
diff --git a/harbour/contrib/hbide/resources/hbmk2_plugin_uip.prg b/harbour/contrib/hbide/resources/hbmk2_plugin_ui.prg
similarity index 93%
rename from harbour/contrib/hbide/resources/hbmk2_plugin_uip.prg
rename to harbour/contrib/hbide/resources/hbmk2_plugin_ui.prg
index 5369131118..ab8eb875cf 100644
--- a/harbour/contrib/hbide/resources/hbmk2_plugin_uip.prg
+++ b/harbour/contrib/hbide/resources/hbmk2_plugin_ui.prg
@@ -28,8 +28,6 @@ FUNCTION hbmk2_plugin_uip( hbmk2 )
    LOCAL nError
    LOCAL lBuildIt
 
-   LOCAL tmp
-
    SWITCH hbmk2[ "cSTATE" ]
    CASE "pre_all"
 
@@ -38,10 +36,11 @@ FUNCTION hbmk2_plugin_uip( hbmk2 )
       aUI := {}
       aUI_Dst := {}
 
-      FOR EACH tmp IN hbmk2[ "params" ]
-         IF Lower( hbmk2_FNameExtGet( tmp ) ) == ".ui"
-            AAdd( aUI, tmp )
-            AAdd( aUI_Dst, cDst := hbmk2_FNameDirExtSet( hbmk2_FNameNameGet( tmp ), hbmk2[ "cWorkDir" ], ".uip" ) )
+      FOR EACH cSrc IN hbmk2[ "params" ]
+         IF Lower( hbmk2_FNameExtGet( cSrc ) ) == ".ui"
+            cDst := hbmk2_FNameDirExtSet( hbmk2_FNameNameGet( cSrc ), hbmk2[ "cWorkDir" ], ".uip" )
+            AAdd( aUI, cSrc )
+            AAdd( aUI_Dst, cDst )
             hbmk2_AddInput_PRG( hbmk2, cDst )
          ENDIF
       NEXT
diff --git a/harbour/contrib/hbqt/hbmk2_plugin_moc.prg b/harbour/contrib/hbqt/hbmk2_plugin_moc.prg
index d692b00f71..64fb167f17 100644
--- a/harbour/contrib/hbqt/hbmk2_plugin_moc.prg
+++ b/harbour/contrib/hbqt/hbmk2_plugin_moc.prg
@@ -28,8 +28,6 @@ FUNCTION hbmk2_plugin_moc( hbmk2 )
    LOCAL nError
    LOCAL lBuildIt
 
-   LOCAL tmp
-
    SWITCH hbmk2[ "cSTATE" ]
    CASE "pre_all"
 
@@ -38,11 +36,12 @@ FUNCTION hbmk2_plugin_moc( hbmk2 )
       aMOC := {}
       aMOC_Dst := {}
 
-      FOR EACH tmp IN hbmk2[ "params" ]
-         IF Lower( hbmk2_FNameExtGet( tmp ) ) == ".h" .OR. ;
-            Lower( hbmk2_FNameExtGet( tmp ) ) == ".hpp"
-            AAdd( aMOC, tmp )
-            AAdd( aMOC_Dst, cDst := hbmk2_FNameDirExtSet( "moc_" + hbmk2_FNameNameGet( tmp ), hbmk2[ "cWorkDir" ], ".cpp" ) )
+      FOR EACH cSrc IN hbmk2[ "params" ]
+         IF Lower( hbmk2_FNameExtGet( cSrc ) ) == ".h" .OR. ;
+            Lower( hbmk2_FNameExtGet( cSrc ) ) == ".hpp"
+            cDst := hbmk2_FNameDirExtSet( "moc_" + hbmk2_FNameNameGet( cSrc ), hbmk2[ "cWorkDir" ], ".cpp" )
+            AAdd( aMOC, cSrc )
+            AAdd( aMOC_Dst, cDst )
             hbmk2_AddInput_CPP( hbmk2, cDst )
          ENDIF
       NEXT
diff --git a/harbour/contrib/makefile.prg b/harbour/contrib/makefile.prg
index 55f18ad215..807f3bf3f7 100644
--- a/harbour/contrib/makefile.prg
+++ b/harbour/contrib/makefile.prg
@@ -242,6 +242,8 @@ PROCEDURE Main( ... )
                IF cType == "lib" .AND. GetEnv( "HB_BUILD_CONTRIB_DLL" ) == "yes" .AND. ;
                   hb_FileExists( FN_ExtSet( cBase + cProject, ".hbc" ) )
 
+                  cInstallDirVar := "HB_BIN_INSTALL_"
+
                   IF AScan( aParams, "clean" ) > 0
                      call_hbmk2( cBase + cProject, cTargetDir, cOptions + " -clean", .T. )
                   ENDIF