diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 803bd1d0eb..2a5ce6b739 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,18 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-06-23 19:09 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  - examples/superlib/hbsuper.hbp
+  + examples/superlib/superlib.hbc
+  + examples/superlib/superlib.dif
+  - examples/superlib/hbsuper.dif
+  * examples/superlib/readme.txt
+  + examples/superlib/superlib.hbp
+    * Change make system to have full multiplatform/multicompiler
+      support. The same all other examples and contribs have.
+    + Added one-liner instruction, how to build superlib based
+      apps using hbmk2.
+
 2009-06-23 18:15 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * include/hbapi.h
   * include/hbapiitm.h
diff --git a/harbour/examples/superlib/readme.txt b/harbour/examples/superlib/readme.txt
index cb8ccef648..ebb2ee46de 100644
--- a/harbour/examples/superlib/readme.txt
+++ b/harbour/examples/superlib/readme.txt
@@ -17,11 +17,14 @@
     hbformat -lFCaseLow=yes -nEol=0 -lIndent=no -lCase=no -lSpaces=no "*.prg"
 
 4.) Apply supplied patch to the source using GNU Patch:
-    patch -lNi hbsuper.dif
+    patch -lNi superlib.dif
 
 5.) Build it:
-    hbmk2 hbsuper.hbp
+    hbmk2 superlib.hbp
 
 6.) You're done.
 
+7.) Finally, to build an application with SuperLib, use:
+    hbmk2 myapp.prg superlib.hbc
+
 [vszakats]
diff --git a/harbour/examples/superlib/hbsuper.dif b/harbour/examples/superlib/superlib.dif
similarity index 100%
rename from harbour/examples/superlib/hbsuper.dif
rename to harbour/examples/superlib/superlib.dif
diff --git a/harbour/examples/superlib/superlib.hbc b/harbour/examples/superlib/superlib.hbc
new file mode 100644
index 0000000000..158d5c3696
--- /dev/null
+++ b/harbour/examples/superlib/superlib.hbc
@@ -0,0 +1,8 @@
+#
+# $Id$
+#
+
+incpaths=.
+libpaths=lib/${hb_arch}/${hb_comp}
+
+libs=super
diff --git a/harbour/examples/superlib/hbsuper.hbp b/harbour/examples/superlib/superlib.hbp
similarity index 98%
rename from harbour/examples/superlib/hbsuper.hbp
rename to harbour/examples/superlib/superlib.hbp
index 5d7752d0db..443ec32a73 100644
--- a/harbour/examples/superlib/hbsuper.hbp
+++ b/harbour/examples/superlib/superlib.hbp
@@ -3,7 +3,7 @@
 #
 
 -hblib
--osuper
+-olib/${hb_arch}/${hb_comp}/super
 -inc
 -q0 -w1 -es2 -l