diff --git a/config/amanda/amanda_configure.m4 b/config/amanda/amanda_configure.m4
index f90810f..5b427ae 100644
--- a/config/amanda/amanda_configure.m4
+++ b/config/amanda/amanda_configure.m4
@@ -18,6 +18,7 @@ AC_PREREQ(2.64)
 # Take care of some early Amanda-specific setup
 #
 AMANDA_CONFIGURE_ARGS
+AMANDA_INIT_SUMMARY
 AMANDA_SNAPSHOT_STAMP
 AMANDA_SPLIT_VERSION
 AMANDA_CONFIG_LOCAL
diff --git a/config/amanda/components.m4 b/config/amanda/components.m4
index 7628453..f2a07db 100644
--- a/config/amanda/components.m4
+++ b/config/amanda/components.m4
@@ -186,21 +186,7 @@ AC_DEFUN([AMANDA_WITHOUT_NDMP], [
 	    n | no) WANT_NDMP=false;;
 	    *) AC_MSG_ERROR([You must not supply an argument to --with-ndmp option.]) ;;
 	    esac
-    ])
-    AC_CHECK_HEADERS(rpc/rpc.h, HAVE_RPC_RPC_H=1)
-    if test x"$WANT_NDMP" = x"true"; then
-	if test x"$HAVE_RPC_RPC_H" = x"1"; then
-	    WANT_NDMP=true
-	else
-	    AMANDA_CHECK_TIRPC
-	    if test x"$HAVE_RPC_RPC_H" = x"1"; then
-		WANT_NDMP=true
-	    else
-		WANT_NDMP=false
-		AMANDA_MSG_WARN([Disabling NDMP because rpc/rpc.h is not found])
-	    fi
-	fi
-   fi
+	])
 ])
 
 # SYNOPSIS
diff --git a/config/amanda/libs.m4 b/config/amanda/libs.m4
index a640557..0388c9b 100644
--- a/config/amanda/libs.m4
+++ b/config/amanda/libs.m4
@@ -183,44 +183,6 @@ AC_DEFUN([AMANDA_CHECK_GLIB], [
     AMANDA_ADD_LIBS($GLIB_LIBS)
 ])
 
-# SYNOPSIS
-#
-#   AMANDA_CHECK_TIRPC
-#
-# OVERVIEW
-#
-#   Search for tirpc.
-#
-AC_DEFUN([AMANDA_CHECK_TIRPC],
-[
-    AC_PATH_PROG(PKG_CONFIG, pkg-config, [], $LOCSYSPATH:/opt/csw/bin:/usr/local/bin:/opt/local/bin)
-
-    tirpc_ld_flags=`$PKG_CONFIG libtirpc --libs-only-L 2>/dev/null`
-    tirpc_lib_flags=`$PKG_CONFIG libtirpc --libs-only-l --libs-only-other 2>/dev/null`
-    tirpc_cppflags=`$PKG_CONFIG libtirpc --cflags-only-I 2>/dev/null`
-    tirpc_cflags=`$PKG_CONFIG libtirpc --cflags-only-other 2>/dev/null`
-
-    _libtirpc_save_cppflags=$CPPFLAGS
-    CPPFLAGS="$CPPFLAGS $tirpc_cppflags"
-    _libtirpc_save_libs=$LIBS
-    LIBS="$LIBS $tirpc_lib_flags"
-
-    unset HAVE_RPC_RPC_H
-    unset ac_cv_header_rpc_rpc_h
-    AC_CHECK_HEADERS(rpc/rpc.h, HAVE_RPC_RPC_H=1)
-
-    CPPFLAGS=$_libtirpc_save_cppflags
-    LIBS=$_libtirpc_save_libs
-
-    if test x"$HAVE_RPC_RPC_H" = x"1"; then
-	AMANDA_ADD_LDFLAGS($tirpc_ld_flags)
-	AMANDA_ADD_LIBS($tirpc_lib_flags)
-
-	AMANDA_ADD_CPPFLAGS($tirpc_cppflags)
-	AMANDA_ADD_CFLAGS($tirpc_cflags)
-    fi
-])
-
 # LIBCURL_CHECK_CONFIG is from the libcurl
 # distribution and licensed under the BSD license:
 # Copyright (c) 1996 - 2007, Daniel Stenberg, <daniel@haxx.se>.
diff --git a/configure.ac b/configure.ac
index 8d325b7..89c4890 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,6 @@ AMANDA_VERSION
 gl_EARLY
 gl_INIT
 
-AMANDA_INIT_SUMMARY
 AMANDA_CONFIGURE
 
 AC_DEFINE([USE_GETTEXT], 1, [Define to 1 if files will be processed with gettextize])
diff --git a/example/amanda-client-postgresql.conf.in b/example/amanda-client-postgresql.conf.in
index f856fc1..f917a5b 100644
--- a/example/amanda-client-postgresql.conf.in
+++ b/example/amanda-client-postgresql.conf.in
@@ -44,6 +44,3 @@ property "foo-PG-DATADIR" "/var/postgresql/data"
 #   For this example:
 #   archive_command = 'test ! -f /var/postgresql/archive/%f && cp %p /var/postgresql/archive/%f'
 property "foo-PG-ARCHIVEDIR" "/var/postgresql/archive"
-
-#resolves "resource temporarily unavailable" bug
-unreserved-tcp-port 1025,65535
diff --git a/example/amanda-client.conf.in b/example/amanda-client.conf.in
index 0d85ec1..be30af0 100644
--- a/example/amanda-client.conf.in
+++ b/example/amanda-client.conf.in
@@ -22,5 +22,3 @@ auth "bsdtcp"
 
 ssh_keys ""			# your ssh keys file if you use ssh auth
 
-#resolves "resource temporarily unavailable" bug
-unreserved-tcp-port 1025,65535
diff --git a/example/amanda.conf.in b/example/amanda.conf.in
index fae76b2..168dd93 100644
--- a/example/amanda.conf.in
+++ b/example/amanda.conf.in
@@ -215,10 +215,10 @@ holdingdisk hd1 {
 # Note that, although the keyword below is infofile, it is only so for
 # historic reasons, since now it is supposed to be a directory (unless
 # you have selected some database format other than the `text' default)
-infofile "/var/lib/amanda/@DEFAULT_CONFIG@/curinfo"	# database DIRECTORY
-logdir   "/var/lib/amanda/@DEFAULT_CONFIG@"		# log directory
-indexdir "/var/lib/amanda/@DEFAULT_CONFIG@/index"	# index directory
-tapelist "/var/lib/amanda/@DEFAULT_CONFIG@/tapelist"	# list of used tapes
+infofile "@CONFIG_DIR@/@DEFAULT_CONFIG@/curinfo"	# database DIRECTORY
+logdir   "@CONFIG_DIR@/@DEFAULT_CONFIG@"		# log directory
+indexdir "@CONFIG_DIR@/@DEFAULT_CONFIG@/index"		# index directory
+#tapelist "@CONFIG_DIR@/@DEFAULT_CONFIG@/tapelist"	# list of used tapes
 # tapelist is stored, by default, in the directory that contains amanda.conf
 
 # tapetypes
@@ -696,7 +696,6 @@ define interface local {
 define application-tool app_amgtar {
     comment "amgtar"
     plugin  "amgtar"
-    property "XATTRS" "YES"
     #property "GNUTAR-PATH" "/path/to/gtar"
     #property "GNUTAR-LISTDIR" "/path/to/gnutar_list_dir"
                     #default from gnutar_list_dir setting in amanda-client.conf
@@ -772,6 +771,3 @@ taperscan "taper_lexical"
 # configurations.
 
 #includefile "@CONFIG_DIR@/amanda.conf.main"
-
-#resolves "resource temporarily unavailable" bug
-unreserved-tcp-port 1025,65535
diff --git a/example/template.d/amanda-S3.conf.in b/example/template.d/amanda-S3.conf.in
index 796191a..8c0d43b 100644
--- a/example/template.d/amanda-S3.conf.in
+++ b/example/template.d/amanda-S3.conf.in
@@ -42,7 +42,6 @@ define dumptype global {
 define application-tool app_amgtar {
     comment "amgtar"
     plugin  "amgtar"
-    property "XATTRS" "YES"
     #property "GNUTAR-PATH" "/path/to/gtar"
     #property "GNUTAR-LISTDIR" "/path/to/gnutar_list_dir"
 }
diff --git a/example/template.d/amanda-harddisk.conf.in b/example/template.d/amanda-harddisk.conf.in
index 67d05b4..3abbc16 100644
--- a/example/template.d/amanda-harddisk.conf.in
+++ b/example/template.d/amanda-harddisk.conf.in
@@ -33,7 +33,6 @@ define dumptype global {
 define application-tool app_amgtar {
     comment "amgtar"
     plugin  "amgtar"
-    property "XATTRS" "YES"
     #property "GNUTAR-PATH" "/path/to/gtar"
     #property "GNUTAR-LISTDIR" "/path/to/gnutar_list_dir"
 }
diff --git a/example/template.d/amanda-single-tape.conf.in b/example/template.d/amanda-single-tape.conf.in
index b82dd99..c4fde14 100644
--- a/example/template.d/amanda-single-tape.conf.in
+++ b/example/template.d/amanda-single-tape.conf.in
@@ -39,7 +39,6 @@ define dumptype global {
 define application-tool app_amgtar {
     comment "amgtar"
     plugin  "amgtar"
-    property "XATTRS" "YES"
     #property "GNUTAR-PATH" "/path/to/gtar"
     #property "GNUTAR-LISTDIR" "/path/to/gnutar_list_dir"
 }
diff --git a/example/template.d/amanda-tape-changer.conf.in b/example/template.d/amanda-tape-changer.conf.in
index 5e4ad04..d4a9831 100644
--- a/example/template.d/amanda-tape-changer.conf.in
+++ b/example/template.d/amanda-tape-changer.conf.in
@@ -39,7 +39,6 @@ define dumptype global {
 define application-tool app_amgtar {
     comment "amgtar"
     plugin  "amgtar"
-    property "XATTRS" "YES"
     #property "GNUTAR-PATH" "/path/to/gtar"
     #property "GNUTAR-LISTDIR" "/path/to/gnutar_list_dir"
 }
diff --git a/server-src/amserverconfig.pl b/server-src/amserverconfig.pl
index 18f59f0..5748dfc 100755
--- a/server-src/amserverconfig.pl
+++ b/server-src/amserverconfig.pl
@@ -656,6 +656,7 @@ if ( defined $template ) {
 &create_customconf;
 }
 
+&check_xinetd;
 &build_amanda_ssh_key;
 
 if ( $vtape_err ) {