diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 2a1b36a613..338da33554 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,11 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-08-02 14:47 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbqt/qscintilla/hbqscintilla.hbc
+    + Added libname.
+    + Added bare dependency autodetection.
+
 2010-08-02 14:37 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbqt/utils/qscintilla.qtp
   - contrib/hbqt/hbqscintilla
diff --git a/harbour/contrib/hbqt/qscintilla/hbqscintilla.hbc b/harbour/contrib/hbqt/qscintilla/hbqscintilla.hbc
index a5d446bd6e..127f34c408 100644
--- a/harbour/contrib/hbqt/qscintilla/hbqscintilla.hbc
+++ b/harbour/contrib/hbqt/qscintilla/hbqscintilla.hbc
@@ -12,14 +12,14 @@ libs=../qtgui/hbqtgui.hbc
 
 incpaths=g
 
-# TODO: dependency detection
--incpath=${HB_WITH_QSCINTILLA}/qt
+-depkeyhead=qscintilla:qsciglobal.h
+-depcontrol=qscintilla:${HB_WITH_QSCINTILLA}
 
-# TODO: lib name of dependency
+# NOTE: untested
 {!HB_STATIC_QT&!hbdyn}libs=hbqscintilla${__HB_DYN__}
-{!HB_STATIC_QT&(allwin|os2)}libs=QScintilla_XXXXXX
-{!HB_STATIC_QT&linux}libs=QScintilla_XXXXXX
-{!HB_STATIC_QT&darwin}libs=/Library/Frameworks/QScintilla_XXXXXX.framework/QScintilla_XXXXXX
+{!HB_STATIC_QT&(allwin|os2)}libs=qscintilla2
+{!HB_STATIC_QT&linux}libs=qscintilla2
+{!HB_STATIC_QT&darwin}libs=/Library/Frameworks/qscintilla2.framework/qscintilla2
 {HB_STATIC_QT&allwin&!hbdyn}libs=hbqscintillas${__HB_DYN__}
 {HB_STATIC_QT&linux}libs=hbqscintilla
-{HB_STATIC_QT&(allwin|linux)}libs=QScintilla_XXXXXX
+{HB_STATIC_QT&(allwin|linux)}libs=qscintilla2