diff --git a/lang/gambas/Makefile b/lang/gambas/Makefile
index e789542bd85e..c631652780c8 100644
--- a/lang/gambas/Makefile
+++ b/lang/gambas/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=		gambas
-PORTVERSION=		0.95
+PORTVERSION=		0.96
 CATEGORIES=		lang
 MASTER_SITES=		http://gambas.sourceforge.net/
 
diff --git a/lang/gambas/distinfo b/lang/gambas/distinfo
index 72accfefb6f1..882d2e8c834a 100644
--- a/lang/gambas/distinfo
+++ b/lang/gambas/distinfo
@@ -1,2 +1,2 @@
-MD5 (gambas-0.95.tar.bz2) = 046e14eece120c72c0dba7587365a793
-SIZE (gambas-0.95.tar.bz2) = 3698616
+MD5 (gambas-0.96.tar.bz2) = f0ea85f689a57348c7429dd24372ae2c
+SIZE (gambas-0.96.tar.bz2) = 3763029
diff --git a/lang/gambas/files/patch-configure b/lang/gambas/files/patch-configure
index 8febdd25613e..e6dee3611289 100644
--- a/lang/gambas/files/patch-configure
+++ b/lang/gambas/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Sat May 15 15:46:47 2004
-+++ configure	Sun May 16 21:24:50 2004
-@@ -6889,6 +6889,7 @@
+--- configure.orig	Mon Aug  2 13:57:46 2004
++++ configure	Mon Aug  2 21:14:08 2004
+@@ -6891,6 +6891,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,7 +8,7 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -7080,10 +7081,10 @@
+@@ -7082,10 +7083,10 @@
  
    case "${host}" in
      *-*-freebsd* )
@@ -23,7 +23,7 @@
        ;;
      *)
        THREAD_LIB="-lpthread"
-@@ -10234,7 +10235,7 @@
+@@ -10280,7 +10281,7 @@
        fi
      done
  
@@ -32,7 +32,7 @@
  
    fi
  
-@@ -10358,26 +10359,13 @@
+@@ -10403,26 +10404,13 @@
        fi
  
        gb_cv_header_sdl=$gb_inc_sdl
@@ -61,7 +61,7 @@
      if test "$gb_cv_header_sdl" = no; then
        have_inc_sdl="no"
        SDL_INC=""
-@@ -10480,16 +10468,7 @@
+@@ -10525,16 +10513,7 @@
      SDL_LIB=""
      SDL_PATH=""
  
@@ -79,20 +79,20 @@
  
    fi
  
-@@ -11246,8 +11225,8 @@
+@@ -11288,8 +11267,8 @@
  fi
  
  
--CFLAGS="$CFLAGS -pipe -Wall"
+-CFLAGS="$CFLAGS -pipe -Wall -fno-strict-aliasing"
 -CXXFLAGS="$CXXFLAGS -pipe -Wall -fno-exceptions"
-+CFLAGS="$CFLAGS -Wall"
++CFLAGS="$CFLAGS -Wall -fno-strict-aliasing"
 +CXXFLAGS="$CXXFLAGS -Wall -fno-exceptions"
  
  if test "$gambas_prof" = "yes"; then
    CFLAGS="$CFLAGS -pg"
-@@ -11277,8 +11256,8 @@
+@@ -11319,8 +11298,8 @@
    CFLAGS="$CFLAGS -Os"
-   CXXFLAGS="$CXXFLAGS -Os"
+   CXXFLAGS="$CXXFLAGS -Os -fno-omit-frame-pointer"
  else
 -  CFLAGS="$CFLAGS -O0"
 -  CXXFLAGS="$CXXFLAGS -O0"
diff --git a/lang/gambas/files/patch-src::share::gb_common.h b/lang/gambas/files/patch-src::share::gb_common.h
deleted file mode 100644
index 92d9f2246afa..000000000000
--- a/lang/gambas/files/patch-src::share::gb_common.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./src/share/gb_common.h.orig	Fri Mar  5 14:57:08 2004
-+++ ./src/share/gb_common.h	Sat Jul 31 18:02:59 2004
-@@ -58,6 +58,11 @@
-   unsigned long ulong;
- #endif
- 
-+#ifdef __FreeBSD__
-+/* Get definition for PATH_MAX */
-+#include <limits.h>
-+#endif
-+
- #ifdef __sun__
-  /* PGS: The following #define prevents /usr/include/sys/mman.h on solaris
-     from #define'ing PRIVATE to 0x20, thus breaking Gambas.
diff --git a/lang/gambas/pkg-plist b/lang/gambas/pkg-plist
index 56f7ea75ce04..a0cfa54e341d 100644
--- a/lang/gambas/pkg-plist
+++ b/lang/gambas/pkg-plist
@@ -100,16 +100,20 @@ lib/gambas/lib.gb.vb.so.0
 %%PORTDOCS%%%%EXAMPLESDIR%%/Automation/KateBrowser/FBrowser.form
 %%PORTDOCS%%%%EXAMPLESDIR%%/Automation/KateBrowser/KateBrowser
 %%PORTDOCS%%%%EXAMPLESDIR%%/Automation/KateBrowser/arrow.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/Automation/KateBrowser/kate.png
 %%PORTDOCS%%%%EXAMPLESDIR%%/Automation/Scripting/.gambas/FSCRIPT
 %%PORTDOCS%%%%EXAMPLESDIR%%/Automation/Scripting/.kdbgrc.gbx
 %%PORTDOCS%%%%EXAMPLESDIR%%/Automation/Scripting/.project
 %%PORTDOCS%%%%EXAMPLESDIR%%/Automation/Scripting/FScript.class
 %%PORTDOCS%%%%EXAMPLESDIR%%/Automation/Scripting/FScript.form
 %%PORTDOCS%%%%EXAMPLESDIR%%/Automation/Scripting/Scripting
+%%PORTDOCS%%%%EXAMPLESDIR%%/Automation/Scripting/background.png
 %%PORTDOCS%%%%EXAMPLESDIR%%/Basic/Blights/.gambas/WIN1
 %%PORTDOCS%%%%EXAMPLESDIR%%/Basic/Blights/.lang/.pot
+%%PORTDOCS%%%%EXAMPLESDIR%%/Basic/Blights/.lang/fr.po
 %%PORTDOCS%%%%EXAMPLESDIR%%/Basic/Blights/.project
 %%PORTDOCS%%%%EXAMPLESDIR%%/Basic/Blights/Blights
+%%PORTDOCS%%%%EXAMPLESDIR%%/Basic/Blights/ampoule.png
 %%PORTDOCS%%%%EXAMPLESDIR%%/Basic/Blights/bloff.xpm
 %%PORTDOCS%%%%EXAMPLESDIR%%/Basic/Blights/blon.xpm
 %%PORTDOCS%%%%EXAMPLESDIR%%/Basic/Blights/win1.class
@@ -122,6 +126,7 @@ lib/gambas/lib.gb.vb.so.0
 %%PORTDOCS%%%%EXAMPLESDIR%%/Basic/Collection/Collection
 %%PORTDOCS%%%%EXAMPLESDIR%%/Basic/Collection/FStart.class
 %%PORTDOCS%%%%EXAMPLESDIR%%/Basic/Collection/FStart.form
+%%PORTDOCS%%%%EXAMPLESDIR%%/Basic/Collection/collection.png
 %%PORTDOCS%%%%EXAMPLESDIR%%/Basic/Object/.gambas/CTHING
 %%PORTDOCS%%%%EXAMPLESDIR%%/Basic/Object/.gambas/FSTART
 %%PORTDOCS%%%%EXAMPLESDIR%%/Basic/Object/.project
@@ -129,11 +134,13 @@ lib/gambas/lib.gb.vb.so.0
 %%PORTDOCS%%%%EXAMPLESDIR%%/Basic/Object/FStart.class
 %%PORTDOCS%%%%EXAMPLESDIR%%/Basic/Object/FStart.form
 %%PORTDOCS%%%%EXAMPLESDIR%%/Basic/Object/Object
+%%PORTDOCS%%%%EXAMPLESDIR%%/Basic/Object/object.png
 %%PORTDOCS%%%%EXAMPLESDIR%%/Basic/Timer/.gambas/FTIMER
 %%PORTDOCS%%%%EXAMPLESDIR%%/Basic/Timer/.project
 %%PORTDOCS%%%%EXAMPLESDIR%%/Basic/Timer/FTimer.class
 %%PORTDOCS%%%%EXAMPLESDIR%%/Basic/Timer/FTimer.form
 %%PORTDOCS%%%%EXAMPLESDIR%%/Basic/Timer/Timer
+%%PORTDOCS%%%%EXAMPLESDIR%%/Basic/Timer/timer.png
 %%PORTDOCS%%%%EXAMPLESDIR%%/Database/DataReportExample/.gambas/FABOUT
 %%PORTDOCS%%%%EXAMPLESDIR%%/Database/DataReportExample/.gambas/FCONN
 %%PORTDOCS%%%%EXAMPLESDIR%%/Database/DataReportExample/.gambas/FMAIN
@@ -166,18 +173,19 @@ lib/gambas/lib.gb.vb.so.0
 %%PORTDOCS%%%%EXAMPLESDIR%%/Database/Database/FMain.form
 %%PORTDOCS%%%%EXAMPLESDIR%%/Database/Database/FRequest.class
 %%PORTDOCS%%%%EXAMPLESDIR%%/Database/Database/FRequest.form
+%%PORTDOCS%%%%EXAMPLESDIR%%/Database/Database/database.png
 %%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/AnalogWatch/.gambas/FRMCLOCK
 %%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/AnalogWatch/.kdbgrc.gbx
 %%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/AnalogWatch/.project
 %%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/AnalogWatch/AnalogWatch
 %%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/AnalogWatch/FrmClock.class
 %%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/AnalogWatch/FrmClock.form
+%%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/AnalogWatch/timer.png
 %%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/Clock/.gambas/FCLOCK
 %%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/Clock/.icon/16.png
 %%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/Clock/.icon/32.png
 %%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/Clock/.icon/48.png
 %%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/Clock/.project
-%%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/Clock/CHANGELOG
 %%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/Clock/Clock
 %%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/Clock/FClock.class
 %%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/Clock/FClock.form
@@ -194,11 +202,13 @@ lib/gambas/lib.gb.vb.so.0
 %%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/ImageViewer/FViewer.class
 %%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/ImageViewer/FViewer.form
 %%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/ImageViewer/ImageViewer
+%%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/ImageViewer/image.png
 %%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/OnScreenDisplay/.gambas/FONSCREENDISPLAY
 %%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/OnScreenDisplay/.project
 %%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/OnScreenDisplay/FOnScreenDisplay.class
 %%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/OnScreenDisplay/FOnScreenDisplay.form
 %%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/OnScreenDisplay/OnScreenDisplay
+%%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/OnScreenDisplay/icon.png
 %%PORTDOCS%%%%EXAMPLESDIR%%/Exec/Console/.gambas/FCONSOLE
 %%PORTDOCS%%%%EXAMPLESDIR%%/Exec/Console/.kdbgrc.gbx
 %%PORTDOCS%%%%EXAMPLESDIR%%/Exec/Console/.lang/.pot
@@ -207,6 +217,7 @@ lib/gambas/lib.gb.vb.so.0
 %%PORTDOCS%%%%EXAMPLESDIR%%/Exec/Console/Console
 %%PORTDOCS%%%%EXAMPLESDIR%%/Exec/Console/FConsole.class
 %%PORTDOCS%%%%EXAMPLESDIR%%/Exec/Console/FConsole.form
+%%PORTDOCS%%%%EXAMPLESDIR%%/Exec/Console/konsole.png
 %%PORTDOCS%%%%EXAMPLESDIR%%/Exec/MoviePlayer/.gambas/FMOVIEPLAYER
 %%PORTDOCS%%%%EXAMPLESDIR%%/Exec/MoviePlayer/.project
 %%PORTDOCS%%%%EXAMPLESDIR%%/Exec/MoviePlayer/FMoviePlayer.class
@@ -291,11 +302,13 @@ lib/gambas/lib.gb.vb.so.0
 %%PORTDOCS%%%%EXAMPLESDIR%%/Networking/ClientSocket/ClientSocket
 %%PORTDOCS%%%%EXAMPLESDIR%%/Networking/ClientSocket/FrmMain.class
 %%PORTDOCS%%%%EXAMPLESDIR%%/Networking/ClientSocket/FrmMain.form
+%%PORTDOCS%%%%EXAMPLESDIR%%/Networking/ClientSocket/socket.png
 %%PORTDOCS%%%%EXAMPLESDIR%%/Networking/DnsClient/.gambas/F
 %%PORTDOCS%%%%EXAMPLESDIR%%/Networking/DnsClient/.project
 %%PORTDOCS%%%%EXAMPLESDIR%%/Networking/DnsClient/DnsClient
 %%PORTDOCS%%%%EXAMPLESDIR%%/Networking/DnsClient/F.class
 %%PORTDOCS%%%%EXAMPLESDIR%%/Networking/DnsClient/F.form
+%%PORTDOCS%%%%EXAMPLESDIR%%/Networking/DnsClient/dnsclient.png
 %%PORTDOCS%%%%EXAMPLESDIR%%/Networking/HTTPGet/.gambas/CLSPARAMS
 %%PORTDOCS%%%%EXAMPLESDIR%%/Networking/HTTPGet/.gambas/F
 %%PORTDOCS%%%%EXAMPLESDIR%%/Networking/HTTPGet/.gambas/FCONFIG
@@ -306,21 +319,25 @@ lib/gambas/lib.gb.vb.so.0
 %%PORTDOCS%%%%EXAMPLESDIR%%/Networking/HTTPGet/FConfig.class
 %%PORTDOCS%%%%EXAMPLESDIR%%/Networking/HTTPGet/FConfig.form
 %%PORTDOCS%%%%EXAMPLESDIR%%/Networking/HTTPGet/HTTPGet
+%%PORTDOCS%%%%EXAMPLESDIR%%/Networking/HTTPGet/httpclient.png
 %%PORTDOCS%%%%EXAMPLESDIR%%/Networking/HTTPPost/.gambas/F
 %%PORTDOCS%%%%EXAMPLESDIR%%/Networking/HTTPPost/.project
 %%PORTDOCS%%%%EXAMPLESDIR%%/Networking/HTTPPost/F.class
 %%PORTDOCS%%%%EXAMPLESDIR%%/Networking/HTTPPost/F.form
 %%PORTDOCS%%%%EXAMPLESDIR%%/Networking/HTTPPost/HTTPPost
+%%PORTDOCS%%%%EXAMPLESDIR%%/Networking/HTTPPost/httpclient.png
 %%PORTDOCS%%%%EXAMPLESDIR%%/Networking/SerialPort/.gambas/FSERIALPORT
 %%PORTDOCS%%%%EXAMPLESDIR%%/Networking/SerialPort/.project
 %%PORTDOCS%%%%EXAMPLESDIR%%/Networking/SerialPort/FSerialPort.class
 %%PORTDOCS%%%%EXAMPLESDIR%%/Networking/SerialPort/FSerialPort.form
 %%PORTDOCS%%%%EXAMPLESDIR%%/Networking/SerialPort/SerialPort
+%%PORTDOCS%%%%EXAMPLESDIR%%/Networking/SerialPort/serialport.png
 %%PORTDOCS%%%%EXAMPLESDIR%%/Networking/ServerSocket/.gambas/FRMMAIN
 %%PORTDOCS%%%%EXAMPLESDIR%%/Networking/ServerSocket/.project
 %%PORTDOCS%%%%EXAMPLESDIR%%/Networking/ServerSocket/FrmMain.class
 %%PORTDOCS%%%%EXAMPLESDIR%%/Networking/ServerSocket/FrmMain.form
 %%PORTDOCS%%%%EXAMPLESDIR%%/Networking/ServerSocket/ServerSocket
+%%PORTDOCS%%%%EXAMPLESDIR%%/Networking/ServerSocket/serversocket.png
 %%PORTDOCS%%%%EXAMPLESDIR%%/Networking/UDPServerClient/.gambas/FRMCLIENT
 %%PORTDOCS%%%%EXAMPLESDIR%%/Networking/UDPServerClient/.gambas/FRMSERVER
 %%PORTDOCS%%%%EXAMPLESDIR%%/Networking/UDPServerClient/.lang/.pot
@@ -332,11 +349,24 @@ lib/gambas/lib.gb.vb.so.0
 %%PORTDOCS%%%%EXAMPLESDIR%%/Networking/UDPServerClient/FrmServer.class
 %%PORTDOCS%%%%EXAMPLESDIR%%/Networking/UDPServerClient/FrmServer.form
 %%PORTDOCS%%%%EXAMPLESDIR%%/Networking/UDPServerClient/UDPServerClient
+%%PORTDOCS%%%%EXAMPLESDIR%%/Networking/UDPServerClient/udpsocket.png
 %%PORTDOCS%%%%EXAMPLESDIR%%/Networking/WebBrowser/.gambas/FBROWSER
 %%PORTDOCS%%%%EXAMPLESDIR%%/Networking/WebBrowser/.project
 %%PORTDOCS%%%%EXAMPLESDIR%%/Networking/WebBrowser/FBrowser.class
 %%PORTDOCS%%%%EXAMPLESDIR%%/Networking/WebBrowser/FBrowser.form
 %%PORTDOCS%%%%EXAMPLESDIR%%/Networking/WebBrowser/WebBrowser
+%%PORTDOCS%%%%EXAMPLESDIR%%/Networking/WebBrowser/webbrowser.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/Sound/MusicPlayer/.gambas/FSOUNDPLAYER
+%%PORTDOCS%%%%EXAMPLESDIR%%/Sound/MusicPlayer/.lang/.pot
+%%PORTDOCS%%%%EXAMPLESDIR%%/Sound/MusicPlayer/.project
+%%PORTDOCS%%%%EXAMPLESDIR%%/Sound/MusicPlayer/FSoundPlayer.class
+%%PORTDOCS%%%%EXAMPLESDIR%%/Sound/MusicPlayer/FSoundPlayer.form
+%%PORTDOCS%%%%EXAMPLESDIR%%/Sound/MusicPlayer/MusicPlayer
+%%PORTDOCS%%%%EXAMPLESDIR%%/Sound/MusicPlayer/open.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/Sound/MusicPlayer/pause.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/Sound/MusicPlayer/play.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/Sound/MusicPlayer/sound.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/Sound/MusicPlayer/stop.png
 %%PORTDOCS%%%%DATADIR%%/help/.rsrc/ChristopheBONNET/ALL_OBJECT.tar.gz
 %%PORTDOCS%%%%DATADIR%%/help/.rsrc/ChristopheBONNET/ALL_OBJECT.tar.gz,v
 %%PORTDOCS%%%%DATADIR%%/help/.rsrc/DifferencesFromVB/vbdiff.png
@@ -5902,6 +5932,10 @@ lib/gambas/lib.gb.vb.so.0
 %%PORTDOCS%%@dirrm %%DATADIR%%/help/.rsrc
 %%PORTDOCS%%@dirrm %%DATADIR%%/help
 @dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Sound/MusicPlayer/.gambas
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Sound/MusicPlayer/.lang
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Sound/MusicPlayer
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Sound
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Networking/WebBrowser/.gambas
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Networking/WebBrowser
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Networking/UDPServerClient/.lang