diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 9951348e14..f7a4d20302 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,12 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-03-07 11:43 UTC+0100 Francesco Saverio Giudice (info/at/fsgiudice.com)
+  * harbour/contrib/examples/uhttpd/uhttpd.prg
+    * Updated uHTTPD (Work in progress)
+      - Commented hb_GCAll() in main loop, I got one GPF randomly.
+      * Fixed an error on threads number calculation
+
 2009-03-07 02:53 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/source/vm/classes.c
     * forbid some usage of __clsModMsg() and unblock some others
@@ -29,7 +35,7 @@
 
   * harbour/contrib/gtwvg/gtwvg.c
     ! Changed the behavior if a GT is child of another GT.
-    
+
   * harbour/contrib/gtwvg/wincallb.c
     ! Cleanups.
 
@@ -64,7 +70,7 @@
 
   * harbour/contrib/gtwvg/tests/demowvg.prg
     ! Updated to execute pure Xbase++ code in all its fury.
-    + Added WvgTabPage() implementation via CUI+GUI demo in 
+    + Added WvgTabPage() implementation via CUI+GUI demo in
       <Traditional><WVG Console with GCUI> menu option.
 
 2009-03-06 21:56 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
diff --git a/harbour/contrib/examples/uhttpd/uhttpd.prg b/harbour/contrib/examples/uhttpd/uhttpd.prg
index 98cf7d7d4a..51b21e0b69 100644
--- a/harbour/contrib/examples/uhttpd/uhttpd.prg
+++ b/harbour/contrib/examples/uhttpd/uhttpd.prg
@@ -554,7 +554,7 @@ FUNCTION MAIN( ... )
          ENDIF
 
          // Memory release
-         hb_GCAll( TRUE )
+         //hb_GCAll( TRUE )
 
       ENDDO
 
@@ -843,10 +843,10 @@ STATIC FUNCTION ProcessConnection()
    WriteToConsole( "Quitting ProcessConnections() " + hb_CStr( nThreadId ) )
 
    IF hb_mutexLock( s_hmtxBusy )
-      s_nThreads--
       //hb_ToOutDebug( "Len( s_aRunningThreads ) = %i\n\r", Len( s_aRunningThreads ) )
       IF ( nPos := aScan( s_aRunningThreads, hb_threadSelf() ) > 0 )
          hb_aDel( s_aRunningThreads, nPos, TRUE )
+         s_nThreads := Len( s_aRunningThreads )
       ENDIF
       hb_mutexUnlock( s_hmtxBusy )
    ENDIF