diff --git a/harbour/ChangeLog.txt b/harbour/ChangeLog.txt
index 97382a34cd..b0e4648ec2 100644
--- a/harbour/ChangeLog.txt
+++ b/harbour/ChangeLog.txt
@@ -10,6 +10,16 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2013-02-13 22:53 UTC+0100 Viktor Szakats (harbour syenar.net)
+  * utils/hbmk2/hbmk2.prg
+    ! fixed libname suggestion in a very obscure case
+
+  * utils/hbmk2/examples/contrib.hbc
+  - utils/hbmk2/examples/contribf.hbc
+    - deleted further .hbc examples with heavy contrib specific
+      information. For live .hbc example it's best to check any
+      of them in /extras/*/ and /contrib/*/ directories
+
 2013-02-13 22:22 UTC+0100 Viktor Szakats (harbour syenar.net)
   * utils/hbmk2/hbmk2.prg
     + better detection of core libraries specified in user make files
diff --git a/harbour/utils/hbmk2/examples/contrib.hbc b/harbour/utils/hbmk2/examples/contrib.hbc
index 37643d590a..a7de1f928b 100644
--- a/harbour/utils/hbmk2/examples/contrib.hbc
+++ b/harbour/utils/hbmk2/examples/contrib.hbc
@@ -2,9 +2,9 @@
 # $Id$
 #
 
-# Don't add here any contribs which have 3rd party dependencies
-# or aren't equally available for all supported Harbour platforms.
-# [vszakats]
-
 # Some popular and portable Harbour contribs
 hbcs=hbct hbmzip
+
+# Some platform specific ones
+{win}hbcs=hbwin
+{unix}hbcs=hbunix
diff --git a/harbour/utils/hbmk2/examples/contribf.hbc b/harbour/utils/hbmk2/examples/contribf.hbc
deleted file mode 100644
index d133e7ea6f..0000000000
--- a/harbour/utils/hbmk2/examples/contribf.hbc
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# $Id$
-#
-
-# Full listing of Harbour contrib libs with availability.
-# [ This should be kept in sync with local make file information. ]
-
-# contribs portable, with no external dependencies:
-hbcs=hbblink hbclipsm hbcomm hbct hbfoxpro hbfship hbgt hbmisc hbmzip hbnf hbsms hbtpathy hbxpp hbziparc rddbm rddsql xhb
-
-# contribs portable, with external dependencies:
-hbcs=hbcurl hbfbird hbgd hbhpdf hbmysql hbpgsql hbtip sddfb sddmy sddpg
-
-# contribs with limited availability (some with external dependencies):
-{!pocc&!xcc&!dmc&!watcom}hbcs=gtalleg
-{!dos}hbcs=hbfimage hbssl
-{linux|win}hbcs=rddads
-{win}hbcs=gtwvg hbblat hbwin
-hbcs=hbodbc
-{!bsd&!hpux&!pocc}hbcs=hbsqlit3
-{!wce}hbcs=hbbz2
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index c551acd6dc..3c07221339 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -7367,6 +7367,10 @@ STATIC FUNCTION CheckLibParam( hbmk, cLibName, lHBC, aParam )
       cOpt != NIL /* always include lib name suggestion, if there was a path in the value */
 
       cOpt := hb_FNameName( cLibName )
+      /* readd empty extension */
+      IF Right( hb_FNameNameExt( cLibName ), 1 ) == "."
+         cOpt += "."
+      ENDIF
       IF cExtL == ".a" .AND. Lower( Left( cOpt, 3 ) ) == "lib"
          cOpt := SubStr( cOpt, 4 )
       ENDIF