diff --git a/ChangeLog.txt b/ChangeLog.txt
index 74f3f548e9..6bcdb60281 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -7,6 +7,20 @@
    Entries may not always be in chronological/commit order.
    See license at the end of file. */
 
+2017-09-13 14:39 UTC Viktor Szakats (vszakats users.noreply.github.com)
+  + contrib/hbcomm/DEPRECATED.txt
+  * contrib/hbgd/tests/counter.prg
+  * contrib/hbgd/tests/imgs_in/57chevy.gif -> contrib/hbgd/tests/imgs_in/d57chevy.gif
+  * contrib/hbgd/tests/imgs_in/7seg.gif -> contrib/hbgd/tests/imgs_in/d7seg.gif
+  * contrib/hbgd/tests/imgs_in/brsd.gif -> contrib/hbgd/tests/imgs_in/dbrsd.gif
+  * contrib/hbgd/tests/imgs_in/fdb.gif -> contrib/hbgd/tests/imgs_in/dfdb.gif
+  * contrib/hbgd/tests/imgs_in/jelly.gif -> contrib/hbgd/tests/imgs_in/djelly.gif
+  * contrib/hbgd/tests/imgs_in/odb.gif -> contrib/hbgd/tests/imgs_in/dodb.gif
+  * contrib/hbgd/tests/imgs_in/odw.gif -> contrib/hbgd/tests/imgs_in/dodw.gif
+  * contrib/hbgd/tests/imgs_in/pdg.gif -> contrib/hbgd/tests/imgs_in/dpdg.gif
+  * contrib/hbgd/tests/imgs_in/pdw.gif -> contrib/hbgd/tests/imgs_in/dpdw.gif
+    * some more sync with 3.4 fork
+
 2017-09-13 14:32 UTC Viktor Szakats (vszakats users.noreply.github.com)
   - extras/guestbk/cgi.ch
   - extras/guestbk/guestbk.hbp
diff --git a/contrib/hbcomm/DEPRECATED.txt b/contrib/hbcomm/DEPRECATED.txt
new file mode 100644
index 0000000000..4eb5f41127
--- /dev/null
+++ b/contrib/hbcomm/DEPRECATED.txt
@@ -0,0 +1,5 @@
+This contrib is deprecated and not maintained anymore.
+
+It also never leapt out of an experimental stage, so use it with caution.
+
+Please switch to the Harbour core serial API ASAP.
diff --git a/contrib/hbgd/tests/counter.prg b/contrib/hbgd/tests/counter.prg
index 9b2da3b7e3..37c0d1c000 100644
--- a/contrib/hbgd/tests/counter.prg
+++ b/contrib/hbgd/tests/counter.prg
@@ -28,7 +28,7 @@ PROCEDURE Main( cValue, cBaseImage )
 
    // A value if not passed
    hb_default( @cValue, Str( hb_RandomInt( 1, 10 ^ DISPLAY_NUM ), DISPLAY_NUM ) )
-   hb_default( @cBaseImage, "57chevy.gif" )
+   hb_default( @cBaseImage, "d57chevy.gif" )
 
    IF ! hb_FileExists( IMAGES_IN + cBaseImage )
       ? "ERROR: Base Image File '" + IMAGES_IN + cBaseImage + "' not found"
diff --git a/contrib/hbgd/tests/imgs_in/57chevy.gif b/contrib/hbgd/tests/imgs_in/d57chevy.gif
similarity index 100%
rename from contrib/hbgd/tests/imgs_in/57chevy.gif
rename to contrib/hbgd/tests/imgs_in/d57chevy.gif
diff --git a/contrib/hbgd/tests/imgs_in/7seg.gif b/contrib/hbgd/tests/imgs_in/d7seg.gif
similarity index 100%
rename from contrib/hbgd/tests/imgs_in/7seg.gif
rename to contrib/hbgd/tests/imgs_in/d7seg.gif
diff --git a/contrib/hbgd/tests/imgs_in/brsd.gif b/contrib/hbgd/tests/imgs_in/dbrsd.gif
similarity index 100%
rename from contrib/hbgd/tests/imgs_in/brsd.gif
rename to contrib/hbgd/tests/imgs_in/dbrsd.gif
diff --git a/contrib/hbgd/tests/imgs_in/fdb.gif b/contrib/hbgd/tests/imgs_in/dfdb.gif
similarity index 100%
rename from contrib/hbgd/tests/imgs_in/fdb.gif
rename to contrib/hbgd/tests/imgs_in/dfdb.gif
diff --git a/contrib/hbgd/tests/imgs_in/jelly.gif b/contrib/hbgd/tests/imgs_in/djelly.gif
similarity index 100%
rename from contrib/hbgd/tests/imgs_in/jelly.gif
rename to contrib/hbgd/tests/imgs_in/djelly.gif
diff --git a/contrib/hbgd/tests/imgs_in/odb.gif b/contrib/hbgd/tests/imgs_in/dodb.gif
similarity index 100%
rename from contrib/hbgd/tests/imgs_in/odb.gif
rename to contrib/hbgd/tests/imgs_in/dodb.gif
diff --git a/contrib/hbgd/tests/imgs_in/odw.gif b/contrib/hbgd/tests/imgs_in/dodw.gif
similarity index 100%
rename from contrib/hbgd/tests/imgs_in/odw.gif
rename to contrib/hbgd/tests/imgs_in/dodw.gif
diff --git a/contrib/hbgd/tests/imgs_in/pdg.gif b/contrib/hbgd/tests/imgs_in/dpdg.gif
similarity index 100%
rename from contrib/hbgd/tests/imgs_in/pdg.gif
rename to contrib/hbgd/tests/imgs_in/dpdg.gif
diff --git a/contrib/hbgd/tests/imgs_in/pdw.gif b/contrib/hbgd/tests/imgs_in/dpdw.gif
similarity index 100%
rename from contrib/hbgd/tests/imgs_in/pdw.gif
rename to contrib/hbgd/tests/imgs_in/dpdw.gif