diff --git a/ChangeLog b/ChangeLog
index a5e3ff05d..9ea0f3b6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-23  Holger Vogt
+ * conf.c, conf.h, ngspice.h, visualc/config.h, configure.ac:
+   update welcome message, version 22
+
 2010-09-23  Robert Larice
  * Makefile.am ,
  * m4/.cvsignore :
diff --git a/configure.ac b/configure.ac
index b6bcbf1cf..e785473de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ dnl Initialisation
 dnl ---------------
 
 dnl Initialisation of configure
-AC_INIT(ngspice,21plus,ngspice-bugs@lists.sourceforge.net)
+AC_INIT(ngspice,22,http://ngspice.sourceforge.net/bugrep.html)
 
 dnl Unique file in the source directory
 AC_CONFIG_SRCDIR([src/ngspice.c])
diff --git a/src/conf.c b/src/conf.c
index 571ad7a32..a6df7a280 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -8,17 +8,19 @@
 #ifdef PACKAGE_BUGREPORT
 #define BUG_ADDRESS		PACKAGE_BUGREPORT
 #else
-#define BUG_ADDRESS		"ngspice-bugs@lists.sourceforge.net"
+#define BUG_ADDRESS		"http://ngspice.sourceforge.net/bugrep.html"
 #endif
 
 char	Spice_Version[] = PACKAGE_VERSION;
-char	Spice_Notice[] = "Please submit bug-reports to: " BUG_ADDRESS;
+char	Spice_Notice[] = "Please file your bug-reports at " BUG_ADDRESS;
 #ifndef _MSC_VER
 char	Spice_Build_Date[] = NGSPICEBUILDDATE;
 #else
 char	Spice_Build_Date[] = __DATE__"   "__TIME__;
 #endif
 
+char	Spice_Manual[] = "Please get your ngspice manual from http://ngspice.sourceforge.net/docs.html";
+
 char	*Spice_Exec_Dir	= NGSPICEBINDIR;
 char	*Spice_Lib_Dir	= NGSPICEDATADIR;
 
diff --git a/src/conf.h b/src/conf.h
index 31619949f..38c0d8f9f 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -4,6 +4,7 @@
 extern char Spice_Version[];
 extern char Spice_Notice[];
 extern char Spice_Build_Date[];
+extern char Spice_Manual[];
 extern char *Spice_Exec_Dir;
 extern char *Spice_Lib_Dir;
 extern char *Def_Editor;
diff --git a/src/frontend/misccoms.c b/src/frontend/misccoms.c
index c2f337076..708bbbded 100644
--- a/src/frontend/misccoms.c
+++ b/src/frontend/misccoms.c
@@ -159,6 +159,7 @@ com_version(wordlist *wl)
 	fprintf(cp_out, "** The U. C. Berkeley CAD Group\n");
 	fprintf(cp_out,
 	  "** Copyright 1985-1994, Regents of the University of California.\n");
+	fprintf(cp_out, "** %s\n", Spice_Manual);
 	if (Spice_Notice != NULL && *Spice_Notice != 0)
 	    fprintf(cp_out, "** %s\n", Spice_Notice);
 	if (Spice_Build_Date != NULL && *Spice_Build_Date != 0)
@@ -171,6 +172,7 @@ com_version(wordlist *wl)
 	    fprintf(cp_out, "******\n");
 	    fprintf(cp_out, "** %s-%s\n", ft_sim->simulator,
 		    ft_sim->version);
+	    fprintf(cp_out, "** %s\n", Spice_Manual);
 	    if (Spice_Notice != NULL && *Spice_Notice != 0)
 		fprintf(cp_out, "** %s\n", Spice_Notice);
 	    if (Spice_Build_Date != NULL && *Spice_Build_Date != 0)
@@ -185,6 +187,7 @@ com_version(wordlist *wl)
 	    fprintf(cp_out, "** The U. C. Berkeley CAD Group\n");
 	    fprintf(cp_out,
 	            "** Copyright 1985-1994, Regents of the University of California.\n");
+	    fprintf(cp_out, "** %s\n", Spice_Manual);
 	    if (Spice_Notice != NULL && *Spice_Notice != 0)
 	        fprintf(cp_out, "** %s\n", Spice_Notice);
 	    if (Spice_Build_Date != NULL && *Spice_Build_Date != 0)
diff --git a/src/include/ngspice.h b/src/include/ngspice.h
index ee72886dd..b9c3cad8d 100644
--- a/src/include/ngspice.h
+++ b/src/include/ngspice.h
@@ -240,6 +240,7 @@ extern char *Spiced_Log;
 extern char Spice_Version[];
 extern char Spice_Notice[];
 extern char Spice_Build_Date[];
+extern char Spice_Manual[];
 
 extern char *News_File;
 extern char *Default_MFB_Cap;
diff --git a/visualc/include/config.h b/visualc/include/config.h
index 5c458d3ae..585322e7a 100644
--- a/visualc/include/config.h
+++ b/visualc/include/config.h
@@ -472,7 +472,7 @@
 #define PACKAGE "ngspice"
 
 /* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "ngspice-bugs@lists.sourceforge.net"
+#define PACKAGE_BUGREPORT "http://ngspice.sourceforge.net/bugrep.html"
 
 /* Define to the full name of this package. */
 #define PACKAGE_NAME "ngspice"