diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 18f96084fd..c55840e625 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,11 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-04-20 13:52 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/xhb/xhb.hbp
+    ! Moving to -std=gnu89 for hbserv.c (maybe more) for *nix platforms.
+      Didn't test it.
+
 2011-04-20 13:43 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * hbbz2/3rd/bz2/bz2.hbp
   * hbbz2/core.c
diff --git a/harbour/contrib/xhb/xhb.hbp b/harbour/contrib/xhb/xhb.hbp
index 21bed13480..b3923bb8b5 100644
--- a/harbour/contrib/xhb/xhb.hbp
+++ b/harbour/contrib/xhb/xhb.hbp
@@ -20,6 +20,9 @@
 -instfile=inc:xhbextrn.ch
 -instfile=inc:xhb.hbx
 
+# For hbserv.c, maybe more
+-cflag=-std=gnu89{!lngcpp&allgcc&unix}
+
 ../hbct/hbct.hbc
 ../hbtip/hbtip.hbc
 ../hbwin/hbwin.hbc