diff --git a/TEMPLATE/TEMPLATE.conf b/TEMPLATE/TEMPLATE.conf
index d006118d4..92d4351c2 100644
--- a/TEMPLATE/TEMPLATE.conf
+++ b/TEMPLATE/TEMPLATE.conf
@@ -6,6 +6,9 @@
 /* Name of the component */
 #define __COMPONENT gb.test
 
+/* Name of the component with points replaced by dashes */
+#define __COMPONENT_DASH gb-test
+
 /* Name of the component with points replaced by underscore */
 #define __COMPONENT_UNDERSCORE gb_test
 
diff --git a/TEMPLATE/template/configure.ac b/TEMPLATE/template/configure.ac
index 8e3885369..b4e997810 100644
--- a/TEMPLATE/template/configure.ac
+++ b/TEMPLATE/template/configure.ac
@@ -1,7 +1,9 @@
 dnl ---- configure.ac for __COMPONENT
 
-AC_INIT(configure.ac)
+m4_include([../version.m4])
+AC_INIT(gambas3-__COMPONENT_DASH, GB_VERSION, GB_MAIL, [], GB_URL)
 AC_CONFIG_MACRO_DIR([m4])
+
 GB_INIT(__COMPONENT)
 AC_PROG_LIBTOOL
 
diff --git a/acinclude.m4 b/acinclude.m4
index e8014c0ed..87a83ed97 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -64,23 +64,22 @@ AC_DEFUN([GB_PRINT_MESSAGES],
 
 AC_DEFUN([GB_INIT_AUTOMAKE],
 [
-  AM_INIT_AUTOMAKE($1, 3.5.90)
+  AM_INIT_AUTOMAKE
   m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)])
-  ##AM_SILENT_RULES([yes])
   AC_CONFIG_HEADER([config.h])
   AC_PREFIX_DEFAULT(/usr)
 
-  GAMBAS_VERSION=3
-  GAMBAS_MINOR_VERSION=5
+  GAMBAS_VERSION=GB_VERSION_MAJOR
+  GAMBAS_MINOR_VERSION=GB_VERSION_MINOR
 
   AC_SUBST(GAMBAS_VERSION)
   AC_SUBST(GAMBAS_MINOR_VERSION)
 
-  AC_DEFINE(GAMBAS_VERSION, 3, Gambas version)
-  AC_DEFINE(GAMBAS_MINOR_VERSION, 5, Gambas minor version)
+  AC_DEFINE(GAMBAS_VERSION, GB_VERSION_MAJOR, Gambas version)
+  AC_DEFINE(GAMBAS_MINOR_VERSION, GB_VERSION_MINOR, Gambas minor version)
 
-  AC_DEFINE(GAMBAS_VERSION_STRING, "3", Gambas version string)
-  AC_DEFINE(GAMBAS_FULL_VERSION_STRING, "3.5", Gambas full version string)
+  AC_DEFINE(GAMBAS_VERSION_STRING, "GB_VERSION_MAJOR", Gambas version string)
+  AC_DEFINE(GAMBAS_FULL_VERSION_STRING, "GB_VERSION_MAJOR.GB_VERSION_MINOR", Gambas full version string)
 
   AC_DEFINE(GAMBAS_FULL_VERSION, 0x03050090, [Full Gambas version])
   AC_DEFINE(GAMBAS_PCODE_VERSION, 0x03050000, [Gambas bytecode version])
@@ -123,11 +122,12 @@ AC_DEFUN([GB_CONFIG_SUBDIRS],
 
 AC_DEFUN([GB_INIT_SHORT],
 [
+	AC_CONFIG_SRCDIR([configure.ac])
   AM_MAINTAINER_MODE
 
   COMPONENT=$1
-  
-  GB_INIT_AUTOMAKE(gambas3-`echo $COMPONENT | sed s/"\."/"-"/g`)
+
+  GB_INIT_AUTOMAKE
 
   AC_CANONICAL_HOST
   
diff --git a/app/configure.ac b/app/configure.ac
index a576eaef5..d48668670 100644
--- a/app/configure.ac
+++ b/app/configure.ac
@@ -2,7 +2,8 @@ dnl ---- configure.ac for Gambas development environment
 
 dnl ---- Initialization
 
-AC_INIT(configure.ac)
+m4_include([../version.m4])
+AC_INIT(gambas3-ide, GB_VERSION, GB_MAIL, [], GB_URL)
 GB_INIT_SHORT(ide)
 
 dnl ---- Check for Portland scripts
diff --git a/comp/configure.ac b/comp/configure.ac
index 020f3def8..ef97d678e 100644
--- a/comp/configure.ac
+++ b/comp/configure.ac
@@ -1,13 +1,10 @@
-dnl ---------------------------------------------------
-dnl
-dnl   configure.in for components written in Gambas
-dnl   (c) Benoît Minisini 2000-2005
-dnl
-dnl ----------------------------------------------------
+dnl ---- configure.ac for Gambas components written in Gambas
 
 dnl ---- Initialization
 
-AC_INIT(configure.ac)
+m4_include([../version.m4])
+AC_INIT(gambas3-comp, GB_VERSION, GB_MAIL, [], GB_URL)
+
 GB_INIT_SHORT(comp)
 
 dnl ---- Create makefiles
diff --git a/configure.ac b/configure.ac
index bfba2d3e4..8eeee49b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,9 @@ dnl ****************************************************************************
 
 dnl ---- Initialization
 
-AC_INIT(configure.ac)
+m4_include([version.m4])
+AC_INIT(gambas3, GB_VERSION, GB_MAIL, [], GB_URL)
+AC_CONFIG_MACRO_DIR([m4])
 
 AC_CONFIG_SUBDIRS(main)
 
diff --git a/examples/configure.ac b/examples/configure.ac
index 0fb74304c..3ed54cd57 100644
--- a/examples/configure.ac
+++ b/examples/configure.ac
@@ -1,6 +1,8 @@
 dnl ---- configure.ac for examples
 
-AC_INIT(configure.ac)
+m4_include([../version.m4])
+AC_INIT(gambas3-examples, GB_VERSION, GB_MAIL, [], GB_URL)
+
 GB_INIT_SHORT(examples)
 
 dnl ---- Create makefiles
diff --git a/gb.cairo/configure.ac b/gb.cairo/configure.ac
index ef3a2b8aa..a78124d18 100644
--- a/gb.cairo/configure.ac
+++ b/gb.cairo/configure.ac
@@ -1,7 +1,9 @@
 dnl ---- configure.ac for gb.cairo
 
-AC_INIT(configure.ac)
+m4_include([../version.m4])
+AC_INIT(gambas3-gb-cairo, GB_VERSION, GB_MAIL, [], GB_URL)
 AC_CONFIG_MACRO_DIR([m4])
+
 GB_INIT(gb.cairo)
 AC_PROG_LIBTOOL
 
diff --git a/gb.compress.bzlib2/configure.ac b/gb.compress.bzlib2/configure.ac
index e48470b8e..caaec5a57 100644
--- a/gb.compress.bzlib2/configure.ac
+++ b/gb.compress.bzlib2/configure.ac
@@ -1,7 +1,9 @@
 dnl ---- Initialization
 
-AC_INIT(configure.ac)
+m4_include([../version.m4])
+AC_INIT(gambas3-gb-compress-bzlib2, GB_VERSION, GB_MAIL, [], GB_URL)
 AC_CONFIG_MACRO_DIR([m4])
+
 GB_INIT(gb.compress.bzlib2)
 AC_PROG_LIBTOOL
 
diff --git a/gb.compress.zlib/configure.ac b/gb.compress.zlib/configure.ac
index 2953d8cec..4f5a0f05a 100644
--- a/gb.compress.zlib/configure.ac
+++ b/gb.compress.zlib/configure.ac
@@ -1,7 +1,9 @@
 dnl ---- Initialization
 
-AC_INIT(configure.ac)
+m4_include([../version.m4])
+AC_INIT(gambas3-gb-compress-zlib, GB_VERSION, GB_MAIL, [], GB_URL)
 AC_CONFIG_MACRO_DIR([m4])
+
 GB_INIT(gb.compress.zlib)
 AC_PROG_LIBTOOL
 
diff --git a/gb.crypt/configure.ac b/gb.crypt/configure.ac
index f93be0fee..9194406b1 100644
--- a/gb.crypt/configure.ac
+++ b/gb.crypt/configure.ac
@@ -1,7 +1,9 @@
 dnl ---- configure.ac for gb.crypt
 
-AC_INIT(configure.ac)
+m4_include([../version.m4])
+AC_INIT(gambas3-gb-crypt, GB_VERSION, GB_MAIL, [], GB_URL)
 AC_CONFIG_MACRO_DIR([m4])
+
 GB_INIT(gb.crypt)
 AC_PROG_LIBTOOL
 
diff --git a/gb.db.mysql/configure.ac b/gb.db.mysql/configure.ac
index ce66243ea..f14681d8f 100644
--- a/gb.db.mysql/configure.ac
+++ b/gb.db.mysql/configure.ac
@@ -1,9 +1,12 @@
 dnl ---- configure.ac for gb.db.mysql driver
 
-AC_INIT(configure.ac)
+m4_include([../version.m4])
+AC_INIT(gambas3-gb-db-mysql, GB_VERSION, GB_MAIL, [], GB_URL)
 AC_CONFIG_MACRO_DIR([m4])
+
 GB_INIT(gb.db.mysql)
-LT_INIT
+AC_PROG_LIBTOOL
+dnl LT_INIT
 
 GB_COMPONENT(
   mysql, MYSQL, gb.db.mysql, [src],
diff --git a/gb.db.odbc/configure.ac b/gb.db.odbc/configure.ac
index fc05203a6..cd15940b3 100644
--- a/gb.db.odbc/configure.ac
+++ b/gb.db.odbc/configure.ac
@@ -1,12 +1,11 @@
-dnl ****************************************************************************
-dnl   configure.ac for gb.db.odbc driver
-dnl   (c) Benoît Minisini 2000-2005
-dnl ****************************************************************************
+dnl ---- configure.ac for gb.db.odbc driver
 
 dnl ---- Initialization
 
-AC_INIT(configure.ac)
+m4_include([../version.m4])
+AC_INIT(gambas3-gb-db-odbc, GB_VERSION, GB_MAIL, [], GB_URL)
 AC_CONFIG_MACRO_DIR([m4])
+
 GB_INIT(gb.db.odbc)
 AC_PROG_LIBTOOL
 
diff --git a/gb.db.postgresql/configure.ac b/gb.db.postgresql/configure.ac
index df2c3933a..2e1d53100 100644
--- a/gb.db.postgresql/configure.ac
+++ b/gb.db.postgresql/configure.ac
@@ -1,7 +1,11 @@
+dnl ---- configure.ac for gb.db.postgresql driver
+
 dnl ---- Initialization
 
-AC_INIT(configure.ac)
+m4_include([../version.m4])
+AC_INIT(gambas3-gb-db-postgresql, GB_VERSION, GB_MAIL, [], GB_URL)
 AC_CONFIG_MACRO_DIR([m4])
+
 GB_INIT(gb.db.postgresql)
 AC_PROG_LIBTOOL
 
diff --git a/gb.db.sqlite2/configure.ac b/gb.db.sqlite2/configure.ac
index 976cb339e..767a10377 100644
--- a/gb.db.sqlite2/configure.ac
+++ b/gb.db.sqlite2/configure.ac
@@ -1,12 +1,11 @@
-dnl ****************************************************************************
-dnl   configure.ac for gb.db.sqlite driver
-dnl   (c) Benoît Minisini 2000-2005
-dnl ****************************************************************************
+dnl ---- configure.ac for gb.db.sqlite2 driver
 
 dnl ---- Initialization
 
-AC_INIT(configure.ac)
+m4_include([../version.m4])
+AC_INIT(gambas3-gb-db-sqlite2, GB_VERSION, GB_MAIL, [], GB_URL)
 AC_CONFIG_MACRO_DIR([m4])
+
 GB_INIT(gb.db.sqlite2)
 AC_PROG_LIBTOOL
 
diff --git a/gb.db.sqlite3/configure.ac b/gb.db.sqlite3/configure.ac
index ae26da209..7061a0a17 100644
--- a/gb.db.sqlite3/configure.ac
+++ b/gb.db.sqlite3/configure.ac
@@ -1,7 +1,9 @@
 dnl ---- configure.ac for gb.db.sqlite
 
-AC_INIT(configure.ac)
+m4_include([../version.m4])
+AC_INIT(gambas3-gb-db-sqlite3, GB_VERSION, GB_MAIL, [], GB_URL)
 AC_CONFIG_MACRO_DIR([m4])
+
 GB_INIT(gb.db.sqlite3)
 AC_PROG_LIBTOOL
 
diff --git a/gb.dbus/configure.ac b/gb.dbus/configure.ac
index 45caca7c3..bc9333b2e 100644
--- a/gb.dbus/configure.ac
+++ b/gb.dbus/configure.ac
@@ -1,9 +1,12 @@
 dnl ---- configure.ac for gb.dbus
 
-AC_INIT(configure.ac)
+m4_include([../version.m4])
+AC_INIT(gambas3-gb-dbus, GB_VERSION, GB_MAIL, [], GB_URL)
 AC_CONFIG_MACRO_DIR([m4])
+
 GB_INIT(gb.dbus)
 AC_PROG_LIBTOOL
+
 GB_COMPONENT_PKG_CONFIG(
   dbus, DBUS, gb.dbus, [src],
   dbus-1)
diff --git a/gb.desktop/configure.ac b/gb.desktop/configure.ac
index 039fae34f..bac43fe74 100644
--- a/gb.desktop/configure.ac
+++ b/gb.desktop/configure.ac
@@ -1,7 +1,9 @@
 dnl ---- configure.ac for gb.desktop
 
-AC_INIT(configure.ac)
+m4_include([../version.m4])
+AC_INIT(gambas3-gb-desktop, GB_VERSION, GB_MAIL, [], GB_URL)
 AC_CONFIG_MACRO_DIR([m4])
+
 GB_INIT(gb.desktop)
 AC_PROG_LIBTOOL
 
diff --git a/gb.gmp/configure.ac b/gb.gmp/configure.ac
index d2bc96a45..e8b3a6f81 100644
--- a/gb.gmp/configure.ac
+++ b/gb.gmp/configure.ac
@@ -1,9 +1,12 @@
 dnl ---- configure.ac for gb.gmp
 
-AC_INIT(configure.ac)
+m4_include([../version.m4])
+AC_INIT(gambas3-gb-gmp, GB_VERSION, GB_MAIL, [], GB_URL)
 AC_CONFIG_MACRO_DIR([m4])
+
 GB_INIT(gb.gmp)
 AC_PROG_LIBTOOL
+
 GB_COMPONENT(
   gmp,
   GMP,
diff --git a/gb.gsl/configure.ac b/gb.gsl/configure.ac
index 911244f76..3a6c7af97 100644
--- a/gb.gsl/configure.ac
+++ b/gb.gsl/configure.ac
@@ -1,7 +1,9 @@
 dnl ---- configure.ac for gb.gsl
 
-AC_INIT(configure.ac)
+m4_include([../version.m4])
+AC_INIT(gambas3-gb-gsl, GB_VERSION, GB_MAIL, [], GB_URL)
 AC_CONFIG_MACRO_DIR([m4])
+
 GB_INIT(gb.gsl)
 AC_PROG_LIBTOOL
 
diff --git a/gb.gtk/configure.ac b/gb.gtk/configure.ac
index 2521c1852..5479ed1ed 100644
--- a/gb.gtk/configure.ac
+++ b/gb.gtk/configure.ac
@@ -1,7 +1,9 @@
 dnl ---- configure.ac for gb.gtk component
 
-AC_INIT(configure.ac)
+m4_include([../version.m4])
+AC_INIT(gambas3-gb-gtk, GB_VERSION, GB_MAIL, [], GB_URL)
 AC_CONFIG_MACRO_DIR([m4])
+
 GB_INIT(gb.gtk)
 AC_PROG_LIBTOOL
 
diff --git a/gb.gtk/src/cpaint_impl.cpp b/gb.gtk/src/cpaint_impl.cpp
index f83852047..f12a23e9e 100644
--- a/gb.gtk/src/cpaint_impl.cpp
+++ b/gb.gtk/src/cpaint_impl.cpp
@@ -134,6 +134,9 @@ static bool init_painting(GB_PAINT *d, cairo_surface_t *target, double w, double
 	}
 	
 	cairo_set_line_width(CONTEXT(d), 1.0);
+	/*cairo_set_line_join(CONTEXT(d), CAIRO_LINE_JOIN_MITER);
+	cairo_set_miter_limit(CONTEXT(d), 10.0);
+	cairo_set_line_cap(CONTEXT(d), CAIRO_LINE_CAP_BUTT);*/
 	
 	dx->font = NULL;
 	dx->font_stack = NULL;
diff --git a/gb.gtk3/configure.ac b/gb.gtk3/configure.ac
index 6a35405aa..84b0a1a13 100644
--- a/gb.gtk3/configure.ac
+++ b/gb.gtk3/configure.ac
@@ -1,7 +1,9 @@
 dnl ---- configure.ac for gb.gtk3 component
 
-AC_INIT(configure.ac)
+m4_include([../version.m4])
+AC_INIT(gambas3-gb-gtk3, GB_VERSION, GB_MAIL, [], GB_URL)
 AC_CONFIG_MACRO_DIR([m4])
+
 GB_INIT(gb.gtk3)
 AC_PROG_LIBTOOL
 
diff --git a/gb.httpd/configure.ac b/gb.httpd/configure.ac
index 2dccefd85..5fb0fa507 100644
--- a/gb.httpd/configure.ac
+++ b/gb.httpd/configure.ac
@@ -1,9 +1,8 @@
 dnl ---- configure.ac for gb.httpd
 
-AC_INIT(configure.ac)
+m4_include([../version.m4])
+AC_INIT(gambas3-gb-httpd, GB_VERSION, GB_MAIL, [], GB_URL)
 AC_CONFIG_MACRO_DIR([m4])
-dnl AC_CANONICAL_SYSTEM
-dnl AC_PROG_CC
 
 GB_INIT(gb.httpd)
 AC_PROG_LIBTOOL
diff --git a/gb.image.imlib/configure.ac b/gb.image.imlib/configure.ac
index 0ce5d6705..8c1d0b731 100644
--- a/gb.image.imlib/configure.ac
+++ b/gb.image.imlib/configure.ac
@@ -1,7 +1,9 @@
 dnl ---- configure.ac for gb.image.imlib
 
-AC_INIT(configure.ac)
+m4_include([../version.m4])
+AC_INIT(gambas3-gb-image-imlib, GB_VERSION, GB_MAIL, [], GB_URL)
 AC_CONFIG_MACRO_DIR([m4])
+
 GB_INIT(gb.image.imlib)
 AC_PROG_LIBTOOL
 
diff --git a/gb.image.io/configure.ac b/gb.image.io/configure.ac
index b71fdbf49..662d2c82a 100644
--- a/gb.image.io/configure.ac
+++ b/gb.image.io/configure.ac
@@ -1,7 +1,9 @@
 dnl ---- configure.ac for gb.image.io
 
-AC_INIT(configure.ac)
+m4_include([../version.m4])
+AC_INIT(gambas3-gb-image-io, GB_VERSION, GB_MAIL, [], GB_URL)
 AC_CONFIG_MACRO_DIR([m4])
+
 GB_INIT(gb.image.io)
 AC_PROG_LIBTOOL
 
diff --git a/gb.jit/configure.ac b/gb.jit/configure.ac
index b3f833851..f4e23d682 100644
--- a/gb.jit/configure.ac
+++ b/gb.jit/configure.ac
@@ -1,7 +1,9 @@
 dnl ---- configure.ac for gb.jit
 
-AC_INIT(configure.ac)
+m4_include([../version.m4])
+AC_INIT(gambas3-gb-jit, GB_VERSION, GB_MAIL, [], GB_URL)
 AC_CONFIG_MACRO_DIR([m4])
+
 GB_INIT(gb.jit)
 AC_PROG_LIBTOOL
 
diff --git a/gb.libxml/configure.ac b/gb.libxml/configure.ac
index 97ca64ba6..7c62c5e46 100644
--- a/gb.libxml/configure.ac
+++ b/gb.libxml/configure.ac
@@ -1,6 +1,8 @@
 dnl ---- configure.ac for gb.xml
 
-AC_INIT(configure.ac)
+m4_include([../version.m4])
+AC_INIT(gambas3-gb-libxml, GB_VERSION, GB_MAIL, [], GB_URL)
+
 AC_CONFIG_MACRO_DIR([m4])
 GB_INIT(gb.libxml)
 AC_PROG_LIBTOOL
diff --git a/gb.media/configure.ac b/gb.media/configure.ac
index 68b3ac382..36e3e111c 100644
--- a/gb.media/configure.ac
+++ b/gb.media/configure.ac
@@ -1,9 +1,12 @@
 dnl ---- configure.ac for gb.media
 
-AC_INIT(configure.ac)
+m4_include([../version.m4])
+AC_INIT(gambas3-gb-media, GB_VERSION, GB_MAIL, [], GB_URL)
 AC_CONFIG_MACRO_DIR([m4])
+
 GB_INIT(gb.media)
 AC_PROG_LIBTOOL
+
 GB_COMPONENT_PKG_CONFIG(
   media, MEDIA, gb.media, [src],
   gstreamer-1.0 gstreamer-video-1.0
diff --git a/gb.mime/configure.ac b/gb.mime/configure.ac
index 2ea8bcf8a..067110151 100644
--- a/gb.mime/configure.ac
+++ b/gb.mime/configure.ac
@@ -1,7 +1,9 @@
 dnl ---- configure.ac for gb.mime
 
-AC_INIT(configure.ac)
+m4_include([../version.m4])
+AC_INIT(gambas3-gb-mime, GB_VERSION, GB_MAIL, [], GB_URL)
 AC_CONFIG_MACRO_DIR([m4])
+
 GB_INIT(gb.mime)
 AC_PROG_LIBTOOL
 
diff --git a/gb.ncurses/configure.ac b/gb.ncurses/configure.ac
index 0a709b980..15cf7bc4c 100644
--- a/gb.ncurses/configure.ac
+++ b/gb.ncurses/configure.ac
@@ -1,7 +1,9 @@
 dnl ---- configure.ac for gb.ncurses
 
-AC_INIT(configure.ac)
+m4_include([../version.m4])
+AC_INIT(gambas3-gb-ncurses, GB_VERSION, GB_MAIL, [], GB_URL)
 AC_CONFIG_MACRO_DIR([m4])
+
 GB_INIT(gb.ncurses)
 AC_PROG_LIBTOOL
 
diff --git a/gb.net.curl/configure.ac b/gb.net.curl/configure.ac
index 8cc57bf46..98e1bf39d 100644
--- a/gb.net.curl/configure.ac
+++ b/gb.net.curl/configure.ac
@@ -1,7 +1,9 @@
 dnl ---- configure.ac for gb.net.curl
 
-AC_INIT(configure.ac)
+m4_include([../version.m4])
+AC_INIT(gambas3-gb-net-curl, GB_VERSION, GB_MAIL, [], GB_URL)
 AC_CONFIG_MACRO_DIR([m4])
+
 GB_INIT(gb.net.curl)
 AC_PROG_LIBTOOL
 
diff --git a/gb.net.smtp/configure.ac b/gb.net.smtp/configure.ac
index 9b7cbb9f2..049e8103c 100644
--- a/gb.net.smtp/configure.ac
+++ b/gb.net.smtp/configure.ac
@@ -1,10 +1,10 @@
 dnl ---- configure.ac for gb.net.smtp
 
-AC_INIT(configure.ac)
-
+m4_include([../version.m4])
+AC_INIT(gambas3-gb-net-smtp, GB_VERSION, GB_MAIL, [], GB_URL)
 AC_CONFIG_MACRO_DIR([m4])
-GB_INIT(gb.net.smtp)
 
+GB_INIT(gb.net.smtp)
 AC_PROG_LIBTOOL
 
 GB_COMPONENT_PKG_CONFIG(
diff --git a/gb.net/configure.ac b/gb.net/configure.ac
index c8f967049..0085d800f 100644
--- a/gb.net/configure.ac
+++ b/gb.net/configure.ac
@@ -1,7 +1,9 @@
 dnl ---- configure.ac for gb.net
 
-AC_INIT(configure.ac)
+m4_include([../version.m4])
+AC_INIT(gambas3-gb-net, GB_VERSION, GB_MAIL, [], GB_URL)
 AC_CONFIG_MACRO_DIR([m4])
+
 GB_INIT(gb.net)
 AC_PROG_LIBTOOL
 
diff --git a/gb.openal/configure.ac b/gb.openal/configure.ac
index c9bb803d2..5f3fe96f2 100644
--- a/gb.openal/configure.ac
+++ b/gb.openal/configure.ac
@@ -1,8 +1,12 @@
 dnl ---- configure.ac for gb.openal
-AC_INIT(configure.ac)
+
+m4_include([../version.m4])
+AC_INIT(gambas3-gb-openal, GB_VERSION, GB_MAIL, [], GB_URL)
 AC_CONFIG_MACRO_DIR([m4])
+
 GB_INIT(gb.openal)
 AC_PROG_LIBTOOL
+
 GB_COMPONENT_PKG_CONFIG(
   openal,
   OPENAL,
diff --git a/gb.opengl/configure.ac b/gb.opengl/configure.ac
index 0a04641cf..87276674b 100644
--- a/gb.opengl/configure.ac
+++ b/gb.opengl/configure.ac
@@ -1,7 +1,9 @@
 dnl ---- configure.ac for gb.opengl
 
-AC_INIT(configure.ac)
+m4_include([../version.m4])
+AC_INIT(gambas3-gb-opengl, GB_VERSION, GB_MAIL, [], GB_URL)
 AC_CONFIG_MACRO_DIR([m4])
+
 GB_INIT(gb.opengl)
 AC_PROG_LIBTOOL
 
diff --git a/gb.openssl/configure.ac b/gb.openssl/configure.ac
index 2e4391442..9c33915da 100644
--- a/gb.openssl/configure.ac
+++ b/gb.openssl/configure.ac
@@ -1,7 +1,9 @@
 dnl ---- configure.ac for gb.openssl
 
-AC_INIT(configure.ac)
+m4_include([../version.m4])
+AC_INIT(gambas3-gb-openssl, GB_VERSION, GB_MAIL, [], GB_URL)
 AC_CONFIG_MACRO_DIR([m4])
+
 GB_INIT(gb.openssl)
 AC_PROG_LIBTOOL
 
diff --git a/gb.pcre/configure.ac b/gb.pcre/configure.ac
index ad3089fdd..09ece3491 100644
--- a/gb.pcre/configure.ac
+++ b/gb.pcre/configure.ac
@@ -1,7 +1,9 @@
 dnl ---- configure.ac for gb.pcre
 
-AC_INIT(configure.ac)
+m4_include([../version.m4])
+AC_INIT(gambas3-gb-pcre, GB_VERSION, GB_MAIL, [], GB_URL)
 AC_CONFIG_MACRO_DIR([m4])
+
 GB_INIT(gb.pcre)
 AC_PROG_LIBTOOL
 
diff --git a/gb.pdf/configure.ac b/gb.pdf/configure.ac
index fd4150f6f..5cb47e569 100644
--- a/gb.pdf/configure.ac
+++ b/gb.pdf/configure.ac
@@ -1,7 +1,9 @@
 dnl ---- configure.ac for gb.pdf
 
-AC_INIT(configure.ac)
+m4_include([../version.m4])
+AC_INIT(gambas3-gb-pdf, GB_VERSION, GB_MAIL, [], GB_URL)
 AC_CONFIG_MACRO_DIR([m4])
+
 GB_INIT(gb.pdf)
 AC_PROG_LIBTOOL
 
diff --git a/gb.qt4/configure.ac b/gb.qt4/configure.ac
index 6210cfffc..6ddcc9fb7 100644
--- a/gb.qt4/configure.ac
+++ b/gb.qt4/configure.ac
@@ -1,7 +1,9 @@
 dnl ---- configure.ac for gb.qt
 
-AC_INIT(configure.ac)
+m4_include([../version.m4])
+AC_INIT(gambas3-gb-qt4, GB_VERSION, GB_MAIL, [], GB_URL)
 AC_CONFIG_MACRO_DIR([m4])
+
 GB_INIT(gb.qt4)
 AC_PROG_LIBTOOL
 
diff --git a/gb.sdl.sound/configure.ac b/gb.sdl.sound/configure.ac
index 506b39c5d..1b1b3516c 100644
--- a/gb.sdl.sound/configure.ac
+++ b/gb.sdl.sound/configure.ac
@@ -1,7 +1,9 @@
 dnl ---- configure.ac for gb.sdl
 
-AC_INIT(configure.ac)
+m4_include([../version.m4])
+AC_INIT(gambas3-gb-sdl-sound, GB_VERSION, GB_MAIL, [], GB_URL)
 AC_CONFIG_MACRO_DIR([m4])
+
 GB_INIT(gb.sdl.sound)
 AC_PROG_LIBTOOL
 
diff --git a/gb.sdl/configure.ac b/gb.sdl/configure.ac
index e07601df2..b7b37425a 100644
--- a/gb.sdl/configure.ac
+++ b/gb.sdl/configure.ac
@@ -1,10 +1,12 @@
 dnl ---- configure.ac for gb.sdl
 
-AC_INIT(configure.ac)
+m4_include([../version.m4])
+AC_INIT(gambas3-gb-sdl, GB_VERSION, GB_MAIL, [], GB_URL)
 AC_CONFIG_MACRO_DIR([m4])
-GB_INIT(gb.sdl)
 
+GB_INIT(gb.sdl)
 AC_PROG_LIBTOOL
+
 GB_CHECK_XWINDOW
 
 dnl TODO: add a version test in GB_COMPONENT!
diff --git a/gb.v4l/configure.ac b/gb.v4l/configure.ac
index fa4e82386..4cbbad784 100644
--- a/gb.v4l/configure.ac
+++ b/gb.v4l/configure.ac
@@ -1,7 +1,9 @@
 dnl ---- configure.ac for gb.v4l
 
-AC_INIT(configure.ac)
+m4_include([../version.m4])
+AC_INIT(gambas3-gb-v4l, GB_VERSION, GB_MAIL, [], GB_URL)
 AC_CONFIG_MACRO_DIR([m4])
+
 GB_INIT(gb.v4l)
 AC_PROG_LIBTOOL
 
diff --git a/gb.xml/configure.ac b/gb.xml/configure.ac
index 748478185..66cf8fb68 100755
--- a/gb.xml/configure.ac
+++ b/gb.xml/configure.ac
@@ -1,7 +1,9 @@
 dnl ---- configure.ac for gb.xml
 
-AC_INIT(configure.ac)
+m4_include([../version.m4])
+AC_INIT(gambas3-gb-xml, GB_VERSION, GB_MAIL, [], GB_URL)
 AC_CONFIG_MACRO_DIR([m4])
+
 GB_INIT(gb.xml)
 AC_PROG_LIBTOOL
 
diff --git a/m4/gbhttpd.m4 b/m4/gb_httpd.m4
similarity index 100%
rename from m4/gbhttpd.m4
rename to m4/gb_httpd.m4
diff --git a/m4/gbsdl.m4 b/m4/gb_sdl.m4
similarity index 100%
rename from m4/gbsdl.m4
rename to m4/gb_sdl.m4
diff --git a/main/configure.ac b/main/configure.ac
index b23883d73..602a4c6c5 100644
--- a/main/configure.ac
+++ b/main/configure.ac
@@ -1,8 +1,9 @@
 dnl ---- configure.ac for main programs
 
-AC_INIT
-AC_CONFIG_SRCDIR([configure.ac])
+m4_include([../version.m4])
+AC_INIT(gambas3-main, GB_VERSION, GB_MAIL, [], GB_URL)
 AC_CONFIG_MACRO_DIR([m4])
+
 GB_INIT(main)
 GB_MATH_FUNC
 LT_INIT 
diff --git a/missing b/missing
index 1c8ff7049..cdea51493 100755
--- a/missing
+++ b/missing
@@ -1,11 +1,10 @@
 #! /bin/sh
-# Common stub for a few missing GNU programs while installing.
+# Common wrapper for a few potentially missing GNU programs.
 
-scriptversion=2006-05-10.23
+scriptversion=2012-06-26.16; # UTC
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
-#   Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,9 +17,7 @@ scriptversion=2006-05-10.23
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -28,66 +25,40 @@ scriptversion=2006-05-10.23
 # the same distribution terms that you use for the rest of that program.
 
 if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
+  echo 1>&2 "Try '$0 --help' for more information"
   exit 1
 fi
 
-run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
-
-msg="missing on your system"
-
 case $1 in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  # Exit code 63 means version mismatch.  This often happens
-  # when the user try to use an ancient version of a tool on
-  # a file that requires a minimum version.  In this case we
-  # we should proceed has if the program had been absent, or
-  # if --run hadn't been passed.
-  if test $? = 63; then
-    run=:
-    msg="probably too old"
-  fi
-  ;;
+
+  --is-lightweight)
+    # Used by our autoconf macros to check whether the available missing
+    # script is modern enough.
+    exit 0
+    ;;
+
+  --run)
+    # Back-compat with the calling convention used by older automake.
+    shift
+    ;;
 
   -h|--h|--he|--hel|--help)
     echo "\
 $0 [OPTION]... PROGRAM [ARGUMENT]...
 
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
+Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
 
 Options:
   -h, --help      display this help and exit
   -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
 
 Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  autom4te     touch the output file, or create a stub one
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
+  aclocal   autoconf  autoheader   autom4te  automake  makeinfo
+  bison     yacc      flex         lex       help2man
+
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
 
 Send bug reports to <bug-automake@gnu.org>."
     exit $?
@@ -99,269 +70,146 @@ Send bug reports to <bug-automake@gnu.org>."
     ;;
 
   -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
+    echo 1>&2 "$0: unknown '$1' option"
+    echo 1>&2 "Try '$0 --help' for more information"
     exit 1
     ;;
 
 esac
 
-# Now exit if we have it, but it failed.  Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program).
-case $1 in
-  lex|yacc)
-    # Not GNU programs, they don't have --version.
+# Run the given program, remember its exit status.
+"$@"; st=$?
+
+# If it succeeded, we are done.
+test $st -eq 0 && exit 0
+
+# Also exit now if we it failed (or wasn't found), and '--version' was
+# passed; such an option is passed most likely to detect whether the
+# program is present and works.
+case $2 in --version|--help) exit $st;; esac
+
+# Exit code 63 means version mismatch.  This often happens when the user
+# tries to use an ancient version of a tool on a file that requires a
+# minimum version.
+if test $st -eq 63; then
+  msg="probably too old"
+elif test $st -eq 127; then
+  # Program was missing.
+  msg="missing on your system"
+else
+  # Program was found and executed, but failed.  Give up.
+  exit $st
+fi
+
+perl_URL=http://www.perl.org/
+flex_URL=http://flex.sourceforge.net/
+gnu_software_URL=http://www.gnu.org/software
+
+program_details ()
+{
+  case $1 in
+    aclocal|automake)
+      echo "The '$1' program is part of the GNU Automake package:"
+      echo "<$gnu_software_URL/automake>"
+      echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/autoconf>"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+    autoconf|autom4te|autoheader)
+      echo "The '$1' program is part of the GNU Autoconf package:"
+      echo "<$gnu_software_URL/autoconf/>"
+      echo "It also requires GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+  esac
+}
+
+give_advice ()
+{
+  # Normalize program name to check for.
+  normalized_program=`echo "$1" | sed '
+    s/^gnu-//; t
+    s/^gnu//; t
+    s/^g//; t'`
+
+  printf '%s\n' "'$1' is $msg."
+
+  configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+  case $normalized_program in
+    autoconf*)
+      echo "You should only need it if you modified 'configure.ac',"
+      echo "or m4 files included by it."
+      program_details 'autoconf'
+      ;;
+    autoheader*)
+      echo "You should only need it if you modified 'acconfig.h' or"
+      echo "$configure_deps."
+      program_details 'autoheader'
+      ;;
+    automake*)
+      echo "You should only need it if you modified 'Makefile.am' or"
+      echo "$configure_deps."
+      program_details 'automake'
+      ;;
+    aclocal*)
+      echo "You should only need it if you modified 'acinclude.m4' or"
+      echo "$configure_deps."
+      program_details 'aclocal'
+      ;;
+   autom4te*)
+      echo "You might have modified some maintainer files that require"
+      echo "the 'automa4te' program to be rebuilt."
+      program_details 'autom4te'
+      ;;
+    bison*|yacc*)
+      echo "You should only need it if you modified a '.y' file."
+      echo "You may want to install the GNU Bison package:"
+      echo "<$gnu_software_URL/bison/>"
+      ;;
+    lex*|flex*)
+      echo "You should only need it if you modified a '.l' file."
+      echo "You may want to install the Fast Lexical Analyzer package:"
+      echo "<$flex_URL>"
+      ;;
+    help2man*)
+      echo "You should only need it if you modified a dependency" \
+           "of a man page."
+      echo "You may want to install the GNU Help2man package:"
+      echo "<$gnu_software_URL/help2man/>"
     ;;
+    makeinfo*)
+      echo "You should only need it if you modified a '.texi' file, or"
+      echo "any other file indirectly affecting the aspect of the manual."
+      echo "You might want to install the Texinfo package:"
+      echo "<$gnu_software_URL/texinfo/>"
+      echo "The spurious makeinfo call might also be the consequence of"
+      echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+      echo "want to install GNU make:"
+      echo "<$gnu_software_URL/make/>"
+      ;;
+    *)
+      echo "You might have modified some files without having the proper"
+      echo "tools for further handling them.  Check the 'README' file, it"
+      echo "often tells you about the needed prerequisites for installing"
+      echo "this package.  You may also peek at any GNU archive site, in"
+      echo "case some other package contains this missing '$1' program."
+      ;;
+  esac
+}
 
-  tar)
-    if test -n "$run"; then
-       echo 1>&2 "ERROR: \`tar' requires --run"
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       exit 1
-    fi
-    ;;
+give_advice "$1" | sed -e '1s/^/WARNING: /' \
+                       -e '2,$s/^/         /' >&2
 
-  *)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       # Could not run --version or --help.  This is probably someone
-       # running `$TOOL --version' or `$TOOL --help' to check whether
-       # $TOOL exists and not knowing $TOOL uses missing.
-       exit 1
-    fi
-    ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $1 in
-  aclocal*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case $f in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  autom4te)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.
-         You can get \`$1' as part of \`Autoconf' from any GNU
-         archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo "#! /bin/sh"
-	echo "# Created by GNU Automake missing as a replacement of"
-	echo "#  $ $@"
-	echo "exit 0"
-	chmod +x $file
-	exit 1
-    fi
-    ;;
-
-  bison|yacc)
-    echo 1>&2 "\
-WARNING: \`$1' $msg.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if test $# -ne 1; then
-        eval LASTARG="\${$#}"
-	case $LASTARG in
-	*.y)
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" y.tab.c
-	    fi
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" y.tab.h
-	    fi
-	  ;;
-	esac
-    fi
-    if test ! -f y.tab.h; then
-	echo >y.tab.h
-    fi
-    if test ! -f y.tab.c; then
-	echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex|flex)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
-    rm -f lex.yy.c
-    if test $# -ne 1; then
-        eval LASTARG="\${$#}"
-	case $LASTARG in
-	*.l)
-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" lex.yy.c
-	    fi
-	  ;;
-	esac
-    fi
-    if test ! -f lex.yy.c; then
-	echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  help2man)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-	 you modified a dependency of a manual page.  You may need the
-	 \`Help2man' package in order for those modifications to take
-	 effect.  You can get \`Help2man' from any GNU archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo ".ab help2man is required to generate this page"
-	exit 1
-    fi
-    ;;
-
-  makeinfo)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    # The file to touch is that specified with -o ...
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -z "$file"; then
-      # ... or it is the one specified with @setfilename ...
-      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '
-	/^@setfilename/{
-	  s/.* \([^ ]*\) *$/\1/
-	  p
-	  q
-	}' $infile`
-      # ... or it is derived from the source name (dir/f.texi becomes f.info)
-      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
-    fi
-    # If the file does not exist, the user really needs makeinfo;
-    # let's fail without touching anything.
-    test -f $file || exit 1
-    touch $file
-    ;;
-
-  tar)
-    shift
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar "$@" && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar "$@" && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-	case $firstarg in
-	*o*)
-	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-	case $firstarg in
-	*h*)
-	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-    fi
-
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
-
-  *)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequisites for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
-    exit 1
-    ;;
-esac
-
-exit 0
+# Propagate the correct exit status (expected to be 127 for a program
+# not found, 63 for a program that failed due to version mismatch).
+exit $st
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:
diff --git a/version.m4 b/version.m4
new file mode 100644
index 000000000..916f7e46b
--- /dev/null
+++ b/version.m4
@@ -0,0 +1,9 @@
+## Package version and e-mail for bugs are defined here
+
+m4_define([GB_VERSION], [3.5.90])
+m4_define([GB_MAIL], [gambas@users.sourceforge.net])
+m4_define([GB_URL], [http://gambas.sourceforge.net])
+
+m4_define([GB_VERSION_MAJOR], [3])
+m4_define([GB_VERSION_MINOR], [5])
+m4_define([GB_VERSION_RELEASE], [90])