diff -uNr old/autoconf/configure.in new/autoconf/configure.in
--- old/autoconf/configure.in	2006-06-16 20:29:13.000000000 +0200
+++ new/autoconf/configure.in	2006-09-17 14:35:49.000000000 +0200
@@ -367,7 +367,6 @@
 AC_DEFINE_UNQUOTED(MAXSENDQLENGTH,$withval),AC_DEFINE(MAXSENDQLENGTH,3000000))
 AC_ARG_WITH(bufferpool, [AC_HELP_STRING([--with-bufferpool=size],[Specify the size of the buffer pool])],
 AC_DEFINE_UNQUOTED(BUFFERPOOL,[($withval * MAXSENDQLENGTH)]),AC_DEFINE(BUFFERPOOL,[(18 * MAXSENDQLENGTH)]))
-AC_ARG_WITH(hostname, [AC_HELP_STRING([--with-hostname=host],[Specify the local hostname of the server])], AC_DEFINE_UNQUOTED(DOMAINNAME,"$withval"),AC_DEFINE_UNQUOTED(DOMAINNAME,"`hostname`"))
 AC_DEFINE_UNQUOTED(MYOSNAME,"`uname -a`")
 AC_ARG_WITH(permissions, [AC_HELP_STRING([--with-permissions=permissions],[Specify the default permissions for
 configuration files])], AC_DEFINE_UNQUOTED(DEFAULT_PERMISSIONS,$withval), AC_DEFINE(DEFAULT_PERMISSIONS, 0600)) 
diff -uNr old/Config new/Config
--- old/Config	2006-06-16 20:29:12.000000000 +0200
+++ new/Config	2006-09-17 14:36:21.000000000 +0200
@@ -77,7 +77,6 @@
 ARG="$ARG--with-nick-history=$NICKNAMEHISTORYLENGTH "
 ARG="$ARG--with-sendq=$MAXSENDQLENGTH "
 ARG="$ARG--with-bufferpool=$BUFFERPOOL "
-ARG="$ARG--with-hostname=$DOMAINNAME "
 ARG="$ARG--with-permissions=$DEFPERM "
 ARG="$ARG--with-fd-setsize=$MAXCONNECTIONS "
 ARG="$ARG--enable-dynamic-linking "
@@ -283,7 +282,6 @@
 DPATH="`pwd`"
 SPATH="`pwd`/src/ircd"
 HUB="1"
-DOMAINNAME=`hostname`
 DEFPERM="0600"
 CRYPTOIRCD=""
 SSLDIR=""
@@ -464,17 +462,6 @@
     esac
 done
 
-TEST="$DOMAINNAME"
-echo ""
-echo "What is the hostname of the server running your IRCd?"
-echo $n "[$TEST] -> $c"
-    read cc
-if [ -z "$cc" ] ; then
-    DOMAINNAME=$TEST
-else
-DOMAINNAME=`eval echo $cc` # modified
-fi
-
 TEST=""
 while [ -z "$TEST" ] ; do
     TEST="$DEFPERM"
@@ -838,7 +825,6 @@
 MAXCONNECTIONS="$MAXCONNECTIONS"
 NICKNAMEHISTORYLENGTH="$NICKNAMEHISTORYLENGTH"
 HUB="$HUB"
-DOMAINNAME="$DOMAINNAME"
 DEFPERM="$DEFPERM"
 CRYPTOIRCD="$CRYPTOIRCD"
 SSLDIR="$SSLDIR"
diff -uNr old/configure new/configure
--- old/configure	2006-06-16 20:29:12.000000000 +0200
+++ new/configure	2006-09-17 14:34:59.000000000 +0200
@@ -11889,19 +11889,6 @@
 
 fi;
 
-# Check whether --with-hostname or --without-hostname was given.
-if test "${with_hostname+set}" = set; then
-  withval="$with_hostname"
-  cat >>confdefs.h <<_ACEOF
-#define DOMAINNAME "$withval"
-_ACEOF
-
-else
-  cat >>confdefs.h <<_ACEOF
-#define DOMAINNAME "`hostname`"
-_ACEOF
-
-fi;
 cat >>confdefs.h <<_ACEOF
 #define MYOSNAME "`uname -a`"
 _ACEOF
diff -uNr old/include/setup.h.in new/include/setup.h.in
--- old/include/setup.h.in	2006-02-03 14:57:19.000000000 +0100
+++ new/include/setup.h.in	2006-09-17 14:35:14.000000000 +0200
@@ -183,9 +183,6 @@
 /* Define if you have crypt */
 #undef HAVE_CRYPT
 
-/* Local hostname of the server */
-#undef DOMAINNAME
-
 /* The OS name and version of the server */
 #undef MYOSNAME
 
diff -uNr old/include/win32/setup.h new/include/win32/setup.h
--- old/include/win32/setup.h	2006-06-16 20:29:14.000000000 +0200
+++ new/include/win32/setup.h	2006-09-17 14:35:40.000000000 +0200
@@ -51,7 +51,6 @@
 #endif
 #define SPATH "."
 #define DPATH "."
-#define DOMAINNAME "irc.net"
 #define NO_U_TYPES
 #define NEED_U_INT32_T
 #define PREFIX_AQ