diff --git a/ChangeLog.txt b/ChangeLog.txt
index 06bcfb4321..166f18243e 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -10,6 +10,16 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2013-03-22 01:52 UTC+0100 Viktor Szakats (harbour syenar.net)
+  * extras/guestbk/guestbk.hbp
+  * extras/guestbk/guestbk.prg
+  * extras/guestbk/inifiles.prg -> extras/guestbk/_inifile.prg
+  * extras/guestbk/cgi.prg -> extras/guestbk/_cgi.prg
+    + guestbk made runnable as script
+    + enabled -w3 warnings
+    ! fixed to build with gtcgi
+    ! fixed -w3 warnings
+
 2013-03-21 19:00 UTC+0100 Viktor Szakats (harbour syenar.net)
   * utils/hbmk2/hbmk2.prg
     + when running a script with hbrun/hbmk2 form cmdline,
diff --git a/extras/guestbk/cgi.prg b/extras/guestbk/_cgi.prg
similarity index 96%
rename from extras/guestbk/cgi.prg
rename to extras/guestbk/_cgi.prg
index 10b7eba096..bf30a980bb 100644
--- a/extras/guestbk/cgi.prg
+++ b/extras/guestbk/_cgi.prg
@@ -124,7 +124,9 @@ METHOD AddPara( cPara, cAlign ) CLASS THTML
 METHOD Generate() CLASS THTML
 
    LOCAL cFile, i, hFile, nPos, cRes := ""
+#if 0
    LOCAL lFlag := .F.
+#endif
 
    // Is this a meta file or hand generated script?
    IF Empty( ::cHTMLFile )
@@ -208,13 +210,13 @@ METHOD SaveToFile( cFile ) CLASS THTML
 
 METHOD ProcessCGI() CLASS THTML
 
-   LOCAL cQuery := ""
-   LOCAL cBuff  := ""
-   LOCAL nBuff  := 0
+   LOCAL cQuery
+   LOCAL cBuff := ""
+   LOCAL nBuff := 0
    LOCAL i
 
    IF Empty( ::aCGIContents )
-      ::aCGIContents := {               ;
+      ::aCGIContents := { ;
          GetEnv( "SERVER_SOFTWARE"   ), ;
          GetEnv( "SERVER_NAME"       ), ;
          GetEnv( "GATEWAY_INTERFACE" ), ;
@@ -234,8 +236,7 @@ METHOD ProcessCGI() CLASS THTML
          GetEnv( "AUTH_TYPE"         ), ;
          GetEnv( "CONTENT_TYPE"      ), ;
          GetEnv( "CONTENT_LENGTH"    ), ;
-         GetEnv( "ANNOTATION_SERVER" )  ;
-         }
+         GetEnv( "ANNOTATION_SERVER" ) }
 
       cQuery := ::GetCGIParam( CGI_QUERY_STRING )
 
@@ -247,8 +248,8 @@ METHOD ProcessCGI() CLASS THTML
 
             IF i > Len( cQuery ) .OR. SubStr( cQuery, i, 1 ) == "&"
 
-               AAdd( ::aQueryFields, ;
-                  { SubStr( cBuff, 1, At( "=", cBuff ) - 1 ), ;
+               AAdd( ::aQueryFields, { ;
+                  SubStr( cBuff, 1, At( "=", cBuff ) - 1 ), ;
                   StrTran( SubStr( cBuff, At( "=", cBuff ) + 1, ;
                   Len( cBuff ) - At( "=", cBuff ) + 1 ), "+", " " ) } )
                cBuff := ""
@@ -264,11 +265,8 @@ METHOD ProcessCGI() CLASS THTML
                   nBuff--
                ENDIF
             ENDIF
-
          NEXT
-
       ENDIF
-
    ENDIF
 
    RETURN Self
diff --git a/extras/guestbk/inifiles.prg b/extras/guestbk/_inifile.prg
similarity index 100%
rename from extras/guestbk/inifiles.prg
rename to extras/guestbk/_inifile.prg
diff --git a/extras/guestbk/guestbk.hbp b/extras/guestbk/guestbk.hbp
index ee2497773c..0699658c7a 100644
--- a/extras/guestbk/guestbk.hbp
+++ b/extras/guestbk/guestbk.hbp
@@ -1,4 +1,8 @@
 
+-w3 -es2
+
+-nulrdd
+
+-gtcgi
+
 guestbk.prg
-inifiles.prg
-cgi.prg
diff --git a/extras/guestbk/guestbk.prg b/extras/guestbk/guestbk.prg
index be2546d4b2..94d6656ced 100644
--- a/extras/guestbk/guestbk.prg
+++ b/extras/guestbk/guestbk.prg
@@ -51,7 +51,6 @@ PROCEDURE Main()
 
    LOCAL oIni  := TIniFile():New( "C:\inetpub\wwwroot\guestbk.ini" )
    LOCAL oHTML := THtml():New()
-   LOCAL aEntr := {}
    LOCAL cOddColor, cEvenColor
    LOCAL cCode, i, j, l, cField, nEntry, cColor
    LOCAL aEntries, aLine, cLine
@@ -155,3 +154,6 @@ PROCEDURE Main()
    ENDIF
 
    RETURN
+
+SET PROCEDURE TO "_cgi.prg"
+SET PROCEDURE TO "_inifile.prg"