diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index b4d813498a..2b59299771 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,11 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-08-03 16:52 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbct/hbct.hbx
+  * contrib/make.hbs
+    ! Fixed to not generate reference to self ANNOUNCE symbol.
+
 2010-08-03 16:49 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * hbct/hbct.hbx
     * Missed to regenerate after last minute mod.
diff --git a/harbour/contrib/hbct/hbct.hbx b/harbour/contrib/hbct/hbct.hbx
index 2fdcdd8762..2e07b06b9b 100644
--- a/harbour/contrib/hbct/hbct.hbx
+++ b/harbour/contrib/hbct/hbct.hbx
@@ -387,7 +387,5 @@ EXTERNAL XTOC
 EXTERNAL ZEROINSERT
 EXTERNAL ZEROREMOVE
 EXTERNAL _HB_CTDSPTIME
-EXTERNAL __HBCT_EXTERN__
-EXTERNAL __HBCT_EXTERN__
 
 #endif
diff --git a/harbour/contrib/make.hbs b/harbour/contrib/make.hbs
index e515cb5896..05fad6c6bb 100755
--- a/harbour/contrib/make.hbs
+++ b/harbour/contrib/make.hbs
@@ -577,7 +577,8 @@ STATIC FUNCTION mk_extern( cLibName, cOutputName )
                cExtern += "ANNOUNCE " + "__" + Upper( FNameNameGet( cOutputName ) ) + "_EXTERN__" + hb_eol()
                cExtern += hb_eol()
                FOR EACH tmp IN aResult
-                  IF ! hb_WildMatch( "HB_GT_*_DEFAULT", tmp[ 2 ] )
+                  IF ! hb_WildMatch( "HB_GT_*_DEFAULT", tmp[ 2 ] ) .AND. ;
+                     ! hb_WildMatch( "__*_EXTERN__", tmp[ 2 ] )
                      cExtern += "EXTERNAL " + tmp[ 2 ] + hb_eol()
                   ENDIF
                NEXT