diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index f27846a730..56e726cc53 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,16 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-03-26 16:58 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+  * INSTALL
+  - contrib/hbapollo
+  * contrib/Makefile
+  + contrib/examples/hbapollo
+    * Moved hbapollo to examples.
+    ; TODO: This, hbwhat, hbgf and hbsqlit2 should be IMO permanently
+            removed from repository. If there are no objections, I'll
+            do it next week.
+
 2009-03-26 16:05 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/contrib/hbole/olecore.c
     * added two notes with default defines for windows header files
diff --git a/harbour/INSTALL b/harbour/INSTALL
index 961b90e23a..29ec600f1c 100644
--- a/harbour/INSTALL
+++ b/harbour/INSTALL
@@ -137,7 +137,6 @@ HOW TO ENABLE OPTIONAL COMPONENTS BEFORE BUILD
 
    HB_INC_ADS=C:\ads\acesdk
    HB_INC_ALLEGRO=C:\allegro\include
-   HB_INC_APOLLO=C:\Apollo\include
    HB_INC_BLAT=C:\blat\full\source
    HB_INC_CURL=C:\curl\include
    HB_INC_FIREBIRD=C:\Firebird\include
diff --git a/harbour/contrib/Makefile b/harbour/contrib/Makefile
index 6f21e1cd6d..2763b2390b 100644
--- a/harbour/contrib/Makefile
+++ b/harbour/contrib/Makefile
@@ -32,7 +32,6 @@ DIRS=\
 # contribs with external dependencies
 DIRS +=\
 	gtalleg \
-	hbapollo \
 	hbblat \
 	hbcurl \
 	hbfbird \
diff --git a/harbour/contrib/hbapollo/ChangeLog b/harbour/contrib/examples/hbapollo/ChangeLog
similarity index 100%
rename from harbour/contrib/hbapollo/ChangeLog
rename to harbour/contrib/examples/hbapollo/ChangeLog
diff --git a/harbour/contrib/hbapollo/Makefile b/harbour/contrib/examples/hbapollo/Makefile
similarity index 100%
rename from harbour/contrib/hbapollo/Makefile
rename to harbour/contrib/examples/hbapollo/Makefile
diff --git a/harbour/contrib/hbapollo/apollo.c b/harbour/contrib/examples/hbapollo/apollo.c
similarity index 100%
rename from harbour/contrib/hbapollo/apollo.c
rename to harbour/contrib/examples/hbapollo/apollo.c
diff --git a/harbour/contrib/hbapollo/apollo.ch b/harbour/contrib/examples/hbapollo/apollo.ch
similarity index 100%
rename from harbour/contrib/hbapollo/apollo.ch
rename to harbour/contrib/examples/hbapollo/apollo.ch
diff --git a/harbour/contrib/hbapollo/apollo1.prg b/harbour/contrib/examples/hbapollo/apollo1.prg
similarity index 100%
rename from harbour/contrib/hbapollo/apollo1.prg
rename to harbour/contrib/examples/hbapollo/apollo1.prg
diff --git a/harbour/contrib/hbapollo/readme.txt b/harbour/contrib/examples/hbapollo/readme.txt
similarity index 100%
rename from harbour/contrib/hbapollo/readme.txt
rename to harbour/contrib/examples/hbapollo/readme.txt
diff --git a/harbour/contrib/hbapollo/tests/apollo.prg b/harbour/contrib/examples/hbapollo/tests/apollo.prg
similarity index 100%
rename from harbour/contrib/hbapollo/tests/apollo.prg
rename to harbour/contrib/examples/hbapollo/tests/apollo.prg
diff --git a/harbour/contrib/hbapollo/tests/hbapollo.hbp b/harbour/contrib/examples/hbapollo/tests/hbapollo.hbp
similarity index 100%
rename from harbour/contrib/hbapollo/tests/hbapollo.hbp
rename to harbour/contrib/examples/hbapollo/tests/hbapollo.hbp