diff --git a/authd/Makefile.in b/authd/Makefile.in
index e0d6401b..a50e2586 100644
--- a/authd/Makefile.in
+++ b/authd/Makefile.in
@@ -372,9 +372,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign authd/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu authd/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign authd/Makefile
+	  $(AUTOMAKE) --gnu authd/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
diff --git a/bandb/Makefile.in b/bandb/Makefile.in
index 85e943fb..63bfdfc5 100644
--- a/bandb/Makefile.in
+++ b/bandb/Makefile.in
@@ -384,9 +384,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign bandb/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bandb/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign bandb/Makefile
+	  $(AUTOMAKE) --gnu bandb/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
diff --git a/configure b/configure
index 88dbc18b..0911b9ec 100755
--- a/configure
+++ b/configure
@@ -850,7 +850,6 @@ with_program_prefix
 with_custom_branding
 with_custom_version
 enable_assert
-enable_iodebug
 enable_profile
 with_nicklen
 with_topiclen
@@ -1510,7 +1509,6 @@ Optional Features:
   --disable-zlib          Disable ziplinks support
   --enable-assert         Enable assert(). Choose between soft(warnings) and
                           hard(aborts the daemon)
-  --enable-iodebug        Enable IO Debugging hooks
   --enable-profile        Enable profiling
   --enable-warnings       Enable all sorts of warnings for debugging.
 
@@ -16479,28 +16477,6 @@ elif test "$assert" = yes; then
 	assert = "hard";
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if you want IO Debugging hooks" >&5
-$as_echo_n "checking if you want IO Debugging hooks... " >&6; }
-# Check whether --enable-iodebug was given.
-if test "${enable_iodebug+set}" = set; then :
-  enableval=$enable_iodebug; iodebug=$enableval
-else
-  iodebug=no
-fi
-
-
-if test "$iodebug" = yes; then
-
-$as_echo "#define USE_IODEBUG_HOOKS 1" >>confdefs.h
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if you want to do a profile build" >&5
 $as_echo_n "checking if you want to do a profile build... " >&6; }
 # Check whether --enable-profile was given.
diff --git a/configure.ac b/configure.ac
index 3f406ea7..2b11d9c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -513,19 +513,6 @@ elif test "$assert" = yes; then
 	assert = "hard";
 fi
 
-AC_MSG_CHECKING(if you want IO Debugging hooks)
-AC_ARG_ENABLE(iodebug,
-AC_HELP_STRING([--enable-iodebug],[Enable IO Debugging hooks]),
-[iodebug=$enableval], [iodebug=no])
-
-if test "$iodebug" = yes; then
-	AC_DEFINE(USE_IODEBUG_HOOKS, 1, [Define this to enable IO Debug hooks.])
-	AC_MSG_RESULT(yes)
-else
-	AC_MSG_RESULT(no)
-fi
-
-
 AC_MSG_CHECKING(if you want to do a profile build)
 AC_ARG_ENABLE(profile,
 AC_HELP_STRING([--enable-profile],[Enable profiling]),
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 4ed7d322..8d7a6a76 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -321,9 +321,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign doc/Makefile
+	  $(AUTOMAKE) --gnu doc/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
diff --git a/extensions/Makefile.in b/extensions/Makefile.in
index 9d6b6149..5a3bda1b 100644
--- a/extensions/Makefile.in
+++ b/extensions/Makefile.in
@@ -687,9 +687,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign extensions/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu extensions/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign extensions/Makefile
+	  $(AUTOMAKE) --gnu extensions/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
diff --git a/include/setup.h.in b/include/setup.h.in
index 5ec7453c..6df76c19 100644
--- a/include/setup.h.in
+++ b/include/setup.h.in
@@ -163,6 +163,9 @@
 /* Define if you have the shl_load function. */
 #undef HAVE_SHL_LOAD
 
+/* Define to 1 if you have the `snprintf' function. */
+#undef HAVE_SNPRINTF
+
 /* Define to 1 if you have the `socketpair' function. */
 #undef HAVE_SOCKETPAIR
 
@@ -374,9 +377,6 @@
 /* Size of the user heap. */
 #undef USER_HEAP_SIZE
 
-/* Define this to enable IO Debug hooks. */
-#undef USE_IODEBUG_HOOKS
-
 /* Enable extensions on AIX 3, Interix.  */
 #ifndef _ALL_SOURCE
 # undef _ALL_SOURCE
diff --git a/ircd/hook.c b/ircd/hook.c
index 24e924b6..e16b8c14 100644
--- a/ircd/hook.c
+++ b/ircd/hook.c
@@ -48,11 +48,6 @@ int num_hooks = 0;
 int last_hook = 0;
 int max_hooks = HOOK_INCREMENT;
 
-#ifdef USE_IODEBUG_HOOKS
-int h_iosend_id;
-int h_iorecv_id;
-int h_iorecvctrl_id;
-#endif
 int h_burst_client;
 int h_burst_channel;
 int h_burst_finished;
@@ -74,12 +69,6 @@ init_hook(void)
 {
 	hooks = rb_malloc(sizeof(hook) * HOOK_INCREMENT);
 
-#ifdef USE_IODEBUG_HOOKS
-	h_iosend_id = register_hook("iosend");
-	h_iorecv_id = register_hook("iorecv");
-	h_iorecvctrl_id = register_hook("iorecvctrl");
-#endif
-
 	h_burst_client = register_hook("burst_client");
 	h_burst_channel = register_hook("burst_channel");
 	h_burst_finished = register_hook("burst_finished");
diff --git a/ircd/packet.c b/ircd/packet.c
index fe18b1df..bb0fdcf0 100644
--- a/ircd/packet.c
+++ b/ircd/packet.c
@@ -235,11 +235,7 @@ read_packet(rb_fde_t * F, void *data)
 {
 	struct Client *client_p = data;
 	int length = 0;
-
 	int binary = 0;
-#ifdef USE_IODEBUG_HOOKS
-	hook_data_int hdata;
-#endif
 
 	while(1)
 	{
@@ -268,13 +264,6 @@ read_packet(rb_fde_t * F, void *data)
 			return;
 		}
 
-#ifdef USE_IODEBUG_HOOKS
-		hdata.client = client_p;
-		hdata.arg1 = readBuf;
-		hdata.arg2 = length;
-		call_hook(h_iorecv_id, &hdata);
-#endif
-
 		if(client_p->localClient->lasttime < rb_current_time())
 			client_p->localClient->lasttime = rb_current_time();
 		client_p->flags &= ~FLAGS_PINGSENT;
diff --git a/ircd/send.c b/ircd/send.c
index f41355d9..8cbae414 100644
--- a/ircd/send.c
+++ b/ircd/send.c
@@ -136,9 +136,7 @@ void
 send_queued(struct Client *to)
 {
 	int retlen;
-#ifdef USE_IODEBUG_HOOKS
-	hook_data_int hd;
-#endif
+
 	rb_fde_t *F = to->localClient->F;
 	if (!F)
 		return;
@@ -147,38 +145,16 @@ send_queued(struct Client *to)
 	if(IsIOError(to))
 		return;
 
-	/* Something wants us to not send anything currently */
-	/* if(IsCork(to))
-		return; */
-
 	/* try to flush later when the write event resets this */
 	if(IsFlush(to))
 		return;
 
-#ifdef USE_IODEBUG_HOOKS
-	hd.client = to;
-	if(to->localClient->buf_sendq.list.head)
-		hd.arg1 = ((buf_line_t *) to->localClient->buf_sendq.list.head->data)->buf +
-	                     to->localClient->buf_sendq.writeofs;
-#endif
-
 	if(rb_linebuf_len(&to->localClient->buf_sendq))
 	{
 		while ((retlen =
 			rb_linebuf_flush(F, &to->localClient->buf_sendq)) > 0)
 		{
 			/* We have some data written .. update counters */
-#ifdef USE_IODEBUG_HOOKS
-                        hd.arg2 = retlen;
-                        call_hook(h_iosend_id, &hd);
-
-                        if(to->localClient->buf_sendq.list.head)
-                                hd.arg1 =
-                                        ((buf_line_t *) to->localClient->buf_sendq.list.head->
-                                         data)->buf + to->localClient->buf_sendq.writeofs;
-#endif
-
-
 			ClearFlush(to);
 
 			to->localClient->sendB += retlen;
diff --git a/libratbox/Makefile.in b/libratbox/Makefile.in
index 6d8cb56d..046c38cb 100644
--- a/libratbox/Makefile.in
+++ b/libratbox/Makefile.in
@@ -100,7 +100,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/libratbox_config.h
-CONFIG_CLEAN_FILES = libratbox.pc include/librb-config.h
+CONFIG_CLEAN_FILES = libratbox.pc
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
diff --git a/libratbox/include/libratbox_config.h.in b/libratbox/include/libratbox_config.h.in
index 6e48c5c7..83fb52ee 100644
--- a/libratbox/include/libratbox_config.h.in
+++ b/libratbox/include/libratbox_config.h.in
@@ -114,6 +114,9 @@
 /* Define to 1 if you have the <signal.h> header file. */
 #undef HAVE_SIGNAL_H
 
+/* Define to 1 if you have the `snprintf' function. */
+#undef HAVE_SNPRINTF
+
 /* Define to 1 if you have the `socketpair' function. */
 #undef HAVE_SOCKETPAIR
 
@@ -210,6 +213,9 @@
 /* Define to 1 if you have the <vfork.h> header file. */
 #undef HAVE_VFORK_H
 
+/* Define to 1 if you have the `vsnprintf' function. */
+#undef HAVE_VSNPRINTF
+
 /* Define to 1 if you are on windows */
 #undef HAVE_WIN32
 
diff --git a/libratbox/src/Makefile.in b/libratbox/src/Makefile.in
index e1fa4b97..da86268f 100644
--- a/libratbox/src/Makefile.in
+++ b/libratbox/src/Makefile.in
@@ -99,7 +99,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/libratbox_config.h
-CONFIG_CLEAN_FILES = version.c version.c.last
+CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
diff --git a/modules/Makefile.in b/modules/Makefile.in
index af79a3bb..321d840c 100644
--- a/modules/Makefile.in
+++ b/modules/Makefile.in
@@ -756,9 +756,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign modules/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign modules/Makefile
+	  $(AUTOMAKE) --gnu modules/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
diff --git a/ssld/Makefile.in b/ssld/Makefile.in
index d760ece6..d7cf4a63 100644
--- a/ssld/Makefile.in
+++ b/ssld/Makefile.in
@@ -371,9 +371,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign ssld/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu ssld/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign ssld/Makefile
+	  $(AUTOMAKE) --gnu ssld/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
diff --git a/tools/Makefile.in b/tools/Makefile.in
index d0543f4c..207da77d 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -371,9 +371,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tools/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tools/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign tools/Makefile
+	  $(AUTOMAKE) --gnu tools/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \