diff --git a/configure b/configure
index f367b880..a5759876 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61.
+# Generated by GNU Autoconf 2.61 for znc 0.048.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -570,11 +570,11 @@ MAKEFLAGS=
 SHELL=${CONFIG_SHELL-/bin/sh}
 
 # Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
+PACKAGE_NAME='znc'
+PACKAGE_TARNAME='znc'
+PACKAGE_VERSION='0.048'
+PACKAGE_STRING='znc 0.048'
+PACKAGE_BUGREPORT=''
 
 ac_subst_vars='SHELL
 PATH_SEPARATOR
@@ -691,7 +691,7 @@ sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE}'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
 infodir='${datarootdir}/info'
 htmldir='${docdir}'
 dvidir='${docdir}'
@@ -1155,7 +1155,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
+\`configure' configures znc 0.048 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1203,7 +1203,7 @@ Fine tuning of the installation directories:
   --infodir=DIR          info documentation [DATAROOTDIR/info]
   --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
   --mandir=DIR           man documentation [DATAROOTDIR/man]
-  --docdir=DIR           documentation root [DATAROOTDIR/doc/PACKAGE]
+  --docdir=DIR           documentation root [DATAROOTDIR/doc/znc]
   --htmldir=DIR          html documentation [DOCDIR]
   --dvidir=DIR           dvi documentation [DOCDIR]
   --pdfdir=DIR           pdf documentation [DOCDIR]
@@ -1219,7 +1219,9 @@ _ACEOF
 fi
 
 if test -n "$ac_init_help"; then
-
+  case $ac_init_help in
+     short | recursive ) echo "Configuration of znc 0.048:";;
+   esac
   cat <<\_ACEOF
 
 Optional Features:
@@ -1313,7 +1315,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-configure
+znc configure 0.048
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1327,7 +1329,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by $as_me, which was
+It was created by znc $as_me 0.048, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -1660,6 +1662,14 @@ fi
 
 
 
+
+
+
+
+
+
+
+
 
 
 
@@ -3843,7 +3853,7 @@ fi
 	fi
 fi
 
-VERSION=`grep '#define VERSION' main.h | awk '{print $3}'`
+VERSION=`grep '#define VERSION' main.h | awk '{print $3}' | head -n 1`
 #
 # Auto detect modules
 
@@ -4292,7 +4302,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by $as_me, which was
+This file was extended by znc $as_me 0.048, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4335,7 +4345,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-config.status
+znc config.status 0.048
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/configure.in b/configure.in
index 8f4d292f..5796d677 100644
--- a/configure.in
+++ b/configure.in
@@ -1,3 +1,4 @@
+dnl Keep the version number in sync with main.h!
 AC_INIT([znc], [0.048])
 AC_PROG_CXX
 AC_CANONICAL_HOST
diff --git a/main.h b/main.h
index 6844a73f..5a57659d 100644
--- a/main.h
+++ b/main.h
@@ -3,6 +3,7 @@
 #ifndef _MAIN_H
 #define _MAIN_H
 
+// Keep the number in sync with configure.in (and also with configure)
 #define VERSION 0.048
 
 #ifndef _MODDIR_