diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 4ecb943ad2..1847eca398 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,10 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-03-13 00:47 UTC+0100 Viktor Szakats (harbour syenar.net)
+  * contrib/hbqt/hbqt_common.hbm
+    ! added special install support for unique dir structure of hbqt
+
 2012-03-12 12:18 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
   * contrib/hbide/ideuisrcmanager.prg
     - Deleted: hack "HB_QTPATH" embedding in batch file.
@@ -51,7 +55,7 @@
         HB_QTPATH is detected and then populated in the temp batch file.
 
     ; This commit is primarily focussed on tool detection.
-      Please try again as per above specifications.         
+      Please try again as per above specifications.
 
 2012-03-07 20:25 UTC+0100 Viktor Szakats (harbour syenar.net)
   * contrib/hbhpdf/harupdf.ch
@@ -65,29 +69,29 @@
   * contrib/hbide/idemain.prg
   * contrib/hbide/ideobject.prg
   + contrib/hbide/ideuisrcmanager.prg
-    + Started: implementation of IDE's next evolution step to 
-       write the upper level code to manipulate Qt Designer 
-       generated ".ui" dialogs. 
+    + Started: implementation of IDE's next evolution step to
+       write the upper level code to manipulate Qt Designer
+       generated ".ui" dialogs.
          HOW IT WORKS
 
            1. Click on "UI Source Manager" icon or "View" menu option.
                 Will open a dock widget at the right docking area.
            2. Drop a .ui ( take one from hbide included .ui's ) onto it.
                 The dialog will show up.
-           3. Click on "Build Source" icon on top-toolbar of "UI Src Manager" 
+           3. Click on "Build Source" icon on top-toolbar of "UI Src Manager"
                 dock widget. Notice that a new editing instance is initiated
-                on the current panel with source file prefixed with "cls_" 
-                and suffixed by .ui's filename. For example, if you have 
+                on the current panel with source file prefixed with "cls_"
+                and suffixed by .ui's filename. For example, if you have
                 dropped "dbstruct.ui" then source will be "cls_dbstruct.prg".
                 This .prg will reside in the same folder where .ui is.
            4. Examine the class code contained in the .prg.
-           5. Click on various controls and see a focus rectangle is placed 
+           5. Click on various controls and see a focus rectangle is placed
                 around that control. Also viaualize the status-bar.
            6. If the control happens to be of type QToolButton or QPushButton
-                ( proof of concept is build for these controls only, yet ), 
+                ( proof of concept is build for these controls only, yet ),
                 you will see two entries in lower-left tree view.
-           7. Click on "Activated" tree-node and see the right-side editor 
-                comes into focus. Write some code in this editor, and then 
+           7. Click on "Activated" tree-node and see the right-side editor
+                comes into focus. Write some code in this editor, and then
                 click on some other control or other tree-node.
            8. Visualize that editing instance containing "cls_*ui.prg" will
                 be refreshed and will contain some additional methods.
@@ -96,8 +100,8 @@
                 in methods represented in the tree-nodes.
 
          PLAY AROUND. Concept is in the making and have to go a long way,
-           but surely it has a potentiality to reach a mile-stone. 
-           Your suggestions are welcome.              
+           but surely it has a potentiality to reach a mile-stone.
+           Your suggestions are welcome.
 
 2012-03-04 23:11 UTC+0100 Viktor Szakats (harbour syenar.net)
   + package/harbour.rb
diff --git a/harbour/contrib/hbqt/hbqt_common.hbm b/harbour/contrib/hbqt/hbqt_common.hbm
index 6b14c5fd34..35697b0cf7 100644
--- a/harbour/contrib/hbqt/hbqt_common.hbm
+++ b/harbour/contrib/hbqt/hbqt_common.hbm
@@ -36,3 +36,11 @@
 {darwin}-depincpath=qt:/Developer/qt/include
 {darwin}-depincpath=qt:/Library/Frameworks
 {beos}-depincpath=qt:/boot/common/include
+
+-instfile=contrib_qt:*.hbc
+-instfile=contrib_qt:*.hbs
+-instfile=contrib_qt:*.txt
+-instfile=contrib_qt_tests:tests/*.*
+
+{_HB_BUILD_INSTALL&_HB_INSTALL_CONTRIB&hblib}-instpath=contrib_qt:${_HB_INSTALL_CONTRIB}/${_HB_CONTRIB_SUBDIR}/../
+{_HB_BUILD_INSTALL&_HB_INSTALL_CONTRIB&hblib}-instpath=contrib_qt_tests:${_HB_INSTALL_CONTRIB}/${_HB_CONTRIB_SUBDIR}/../tests/