diff --git a/linphone/Makefile.am b/linphone/Makefile.am
index 2e60090ac..ebfc748b4 100644
--- a/linphone/Makefile.am
+++ b/linphone/Makefile.am
@@ -56,7 +56,8 @@ DISTCLEANFILES= intltool-extract intltool-merge intltool-update po/stamp-it po/.
 
 # `make rpm'
 
-all-local: linphone.spec linphone.iss
+all-local: linphone.spec linphone.iss builddate.h
+
 linphone.spec: linphone.spec.in
 
 .phony: rpm
@@ -130,6 +131,9 @@ setup.exe: filelist
 	rm -f $(INSTALLDIR_WITH_PREFIX)/$(PACKAGE_WIN32_FILELIST)
 	rm -f $(INSTALLDIR_WITH_PREFIX)/$(ISS_SCRIPT)
 
+newdate:
+	cd gtk-glade && $(MAKE) newdate
+
 
 
 
diff --git a/linphone/configure.in b/linphone/configure.in
index cd360bbce..8a85cd294 100644
--- a/linphone/configure.in
+++ b/linphone/configure.in
@@ -146,6 +146,18 @@ AC_ARG_ENABLE(manual,
         *) AC_MSG_ERROR(bad value ${enableval} for --enable-manual) ;;
       esac],[build_manual=yes])
 
+AC_ARG_ENABLE(date,
+      [  --enable-date    Use build date in internal version number],
+      [case "${enableval}" in
+        yes) use_date=yes ;;
+        no)  use_date=no ;;
+        *) AC_MSG_ERROR(bad value ${enableval} for --enable-date) ;;
+      esac],[use_date=no])
+
+if test x$use_date =  xyes ; then
+	AC_DEFINE(USE_BUILDDATE_VERSION,1,[Tell whether date_version.h must be used])
+fi
+
 
 dnl enable ipv6 support
 AC_ARG_ENABLE(ipv6,
diff --git a/linphone/gtk-glade/Makefile.am b/linphone/gtk-glade/Makefile.am
index 4f8f67f80..58b6438d0 100644
--- a/linphone/gtk-glade/Makefile.am
+++ b/linphone/gtk-glade/Makefile.am
@@ -22,9 +22,12 @@ EXTRA_DIST=	$(PIXMAPS) \
 
 if BUILD_GLADE_UI
 
+BUILT_SOURCES=version_date.h
+
 bin_PROGRAMS=linphone-3
 
-linphone_3_SOURCES=	main.c \
+linphone_3_SOURCES=	\
+			main.c \
 			propertybox.c \
 			friendlist.c \
 			support.c \
@@ -36,7 +39,7 @@ linphone_3_SOURCES=	main.c \
 			utils.c \
 			setupwizard.c\
 			incall_view.c \
-			linphone.h
+			linphone.h 
 
 linphone_3_LDADD=$(top_builddir)/oRTP/src/libortp.la \
 		$(top_builddir)/mediastreamer2/src/libmediastreamer.la \
@@ -57,7 +60,7 @@ linphone_3_LDFLAGS=-export-dynamic
 endif
 
 gladedir=$(datadir)/linphone
-glade_DATA=$(GLADE_FILES) $(PIXMAPS)
+glade_DATA=$(GLADE_FILES) $(PIXMAPS) $(top_srcdir)/COPYING
 
 #all-local:	gtk-linphone.ui	
 
@@ -73,3 +76,11 @@ AM_CFLAGS= -DIN_LINPHONE -I$(top_srcdir)/coreapi/ \
 		$(ORTP_CFLAGS) $(OSIP_CFLAGS) 
 
 
+version_date.h: $(top_srcdir)/configure.in
+	echo "#define LINPHONE_VERSION_DATE \"$(VERSION)-`date +%y%m%d`\"" > $@
+
+newdate:
+	rm -f version_date.h
+
+CLEANFILES=version_date.h
+
diff --git a/linphone/gtk-glade/linphone.h b/linphone/gtk-glade/linphone.h
index a10f77dac..16d218551 100644
--- a/linphone/gtk-glade/linphone.h
+++ b/linphone/gtk-glade/linphone.h
@@ -33,6 +33,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define _(String) gettext (String)
 #endif
 
+#ifdef USE_BUILDDATE_VERSION
+#include "version_date.h"
+#undef LINPHONE_VERSION
+#define LINPHONE_VERSION LINPHONE_VERSION_DATE
+#endif
+
 GdkPixbuf * create_pixbuf(const gchar *filename);
 GdkPixbufAnimation *create_pixbuf_animation(const gchar *filename);
 void add_pixmap_directory(const gchar *directory);
diff --git a/linphone/gtk-glade/main.c b/linphone/gtk-glade/main.c
index 698a9d897..b91b5b92a 100644
--- a/linphone/gtk-glade/main.c
+++ b/linphone/gtk-glade/main.c
@@ -19,9 +19,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #define USE_LIBGLADE 1
 
+#include "linphone.h"
 #include "lpconfig.h"
 
-#include "linphone.h"
+
 
 #ifdef USE_LIBGLADE
 #include <glade/glade.h>
@@ -95,7 +96,7 @@ static GOptionEntry linphone_options[]={
 	    .short_name = 'a',
 	    .arg = G_OPTION_ARG_NONE,
 	    .arg_data = (gpointer) & auto_answer,
-	    .description = N_("if set,b automatically answer incoming calls")
+	    .description = N_("if set automatically answer incoming calls")
 	},
 	{0}
 };
@@ -301,12 +302,18 @@ void linphone_gtk_about_response(GtkDialog *dialog, gint id){
 	}
 }
 
+static void about_url_clicked(GtkAboutDialog *dialog, const char *url, gpointer data){
+	g_message("About url clicked");
+	linphone_gtk_open_browser(url);
+}
+
 void linphone_gtk_show_about(){
 	struct stat filestat;
-	const char *license_file=PACKAGE_DATA_DIR "/doc/COPYING";
+	const char *license_file=PACKAGE_DATA_DIR "/linphone/COPYING";
 	GtkWidget *about;
-
+	
 	about=linphone_gtk_create_window("about");
+	gtk_about_dialog_set_url_hook(about_url_clicked,NULL,NULL);
 	memset(&filestat,0,sizeof(filestat));
 	if (stat(license_file,&filestat)!=0){
 		license_file="COPYING";
@@ -770,6 +777,8 @@ static void icon_popup_menu(GtkStatusIcon *status_icon, guint button, guint acti
 }
 
 void linphone_gtk_open_browser(const char *url){
+	gtk_show_uri(NULL,url,GDK_CURRENT_TIME,NULL);
+#if 0
 #ifdef WIN32
 	ShellExecute(0,"open",url,NULL,NULL,1);
 #else
@@ -777,6 +786,7 @@ void linphone_gtk_open_browser(const char *url){
 	snprintf(cl,sizeof(cl),"/usr/bin/x-www-browser %s",url);
 	g_spawn_command_line_async(cl,NULL);
 #endif
+#endif
 }
 
 void linphone_gtk_link_to_website(GtkWidget *item){