diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 0ccd03ad3a..2fcb2d0fc7 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,12 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-11-24 01:55 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbplist
+  - examples/uhttpd2
+  + contrib/hbhttpd
+    + Moved uhttpd2 to contrib area under the name hbhttpd.
+
 2010-11-24 01:48 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * examples/uhttpd2/umain.prg
   * examples/uhttpd2/uhttpd2.hbp
diff --git a/harbour/examples/uhttpd2/readme.txt b/harbour/contrib/hbhttpd/readme.txt
similarity index 100%
rename from harbour/examples/uhttpd2/readme.txt
rename to harbour/contrib/hbhttpd/readme.txt
diff --git a/harbour/examples/uhttpd2/tests/carts.dbf b/harbour/contrib/hbhttpd/tests/carts.dbf
similarity index 100%
rename from harbour/examples/uhttpd2/tests/carts.dbf
rename to harbour/contrib/hbhttpd/tests/carts.dbf
diff --git a/harbour/examples/uhttpd2/tests/files/main.css b/harbour/contrib/hbhttpd/tests/files/main.css
similarity index 100%
rename from harbour/examples/uhttpd2/tests/files/main.css
rename to harbour/contrib/hbhttpd/tests/files/main.css
diff --git a/harbour/examples/uhttpd2/tests/files/main.js b/harbour/contrib/hbhttpd/tests/files/main.js
similarity index 100%
rename from harbour/examples/uhttpd2/tests/files/main.js
rename to harbour/contrib/hbhttpd/tests/files/main.js
diff --git a/harbour/examples/uhttpd2/tests/hbmk.hbm b/harbour/contrib/hbhttpd/tests/hbmk.hbm
similarity index 100%
rename from harbour/examples/uhttpd2/tests/hbmk.hbm
rename to harbour/contrib/hbhttpd/tests/hbmk.hbm
diff --git a/harbour/examples/uhttpd2/tests/items.dbf b/harbour/contrib/hbhttpd/tests/items.dbf
similarity index 100%
rename from harbour/examples/uhttpd2/tests/items.dbf
rename to harbour/contrib/hbhttpd/tests/items.dbf
diff --git a/harbour/examples/uhttpd2/tests/users.dbf b/harbour/contrib/hbhttpd/tests/users.dbf
similarity index 100%
rename from harbour/examples/uhttpd2/tests/users.dbf
rename to harbour/contrib/hbhttpd/tests/users.dbf
diff --git a/harbour/examples/uhttpd2/tests/webapp.prg b/harbour/contrib/hbhttpd/tests/webapp.prg
similarity index 100%
rename from harbour/examples/uhttpd2/tests/webapp.prg
rename to harbour/contrib/hbhttpd/tests/webapp.prg
diff --git a/harbour/examples/uhttpd2/uhttpd2.hbc b/harbour/contrib/hbhttpd/uhttpd2.hbc
similarity index 100%
rename from harbour/examples/uhttpd2/uhttpd2.hbc
rename to harbour/contrib/hbhttpd/uhttpd2.hbc
diff --git a/harbour/examples/uhttpd2/uhttpd2.hbp b/harbour/contrib/hbhttpd/uhttpd2.hbp
similarity index 100%
rename from harbour/examples/uhttpd2/uhttpd2.hbp
rename to harbour/contrib/hbhttpd/uhttpd2.hbp
diff --git a/harbour/examples/uhttpd2/umain.prg b/harbour/contrib/hbhttpd/umain.prg
similarity index 100%
rename from harbour/examples/uhttpd2/umain.prg
rename to harbour/contrib/hbhttpd/umain.prg
diff --git a/harbour/examples/uhttpd2/uwidgets.prg b/harbour/contrib/hbhttpd/uwidgets.prg
similarity index 100%
rename from harbour/examples/uhttpd2/uwidgets.prg
rename to harbour/contrib/hbhttpd/uwidgets.prg
diff --git a/harbour/contrib/hbplist b/harbour/contrib/hbplist
index 16d160beba..df4dc2aa0a 100644
--- a/harbour/contrib/hbplist
+++ b/harbour/contrib/hbplist
@@ -21,6 +21,7 @@ hbfship/hbfship.hbp
 hbgd/hbgd.hbp
 hbgt/hbgt.hbp
 hbhpdf/hbhpdf.hbp                # uses: libhpdf (locally hosted)
+hbhttpd/hbhttpd.hbp
 hbide/hbide.hbp
 hbmemio/hbmemio.hbp
 hbmisc/hbmisc.hbp