diff --git a/Makefile.am b/Makefile.am
index ca60326e..b47bdd16 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,48 +1,46 @@
 MAINTAINERCLEANFILES	= Makefile.in aclocal.m4 configure depcomp \
 			  config.guess config.sub missing install-sh \
 			  ltmain.sh compile config.h.in config.h.in~ \
 			  autoscan.log configure.scan
 
 AUTOMAKE_OPTIONS	= foreign
 
 ACLOCAL_AMFLAGS		= -I m4
 
 SUBDIRS			= libtap libknet libvty tests
 
 if BUILD_DOCS
 SUBDIRS			+= docs
 endif
 
 AM_CFLAGS		= \
 			  -I$(top_srcdir)/libtap \
 			  -I$(top_srcdir)/libknet \
 			  -I$(top_srcdir)/libvty
 
 dist_doc_DATA		= \
 			  COPYING.applications \
 			  COPYING.libraries \
 			  COPYRIGHT \
 			  README.licence \
 			  README \
 			  TODO
 
 noinst_HEADERS		= \
 			  cfg.h \
-			  netutils.h \
 			  utils.h
 
 sbin_PROGRAMS		= kronosnetd
 
 kronosnetd_SOURCES	= \
 			  cfg.c \
 			  main.c \
-			  netutils.c \
 			  utils.c
 
 kronosnetd_LDADD	= \
 			  $(top_builddir)/libvty/libvty.a \
 			  $(top_builddir)/libknet/libknet.a \
 			  $(top_builddir)/libtap/libtap.la
 
 maintainer-clean-local:
 	rm -rf m4
diff --git a/libvty/Makefile.am b/libvty/Makefile.am
index 2d6c5a75..f9f4625a 100644
--- a/libvty/Makefile.am
+++ b/libvty/Makefile.am
@@ -1,21 +1,23 @@
 MAINTAINERCLEANFILES	= Makefile.in
 
 AM_CFLAGS		= \
 			  -I$(top_srcdir)/libtap \
 			  -I$(top_srcdir)/libknet
 
 noinst_HEADERS		= \
 			  vty.h \
 			  vty_auth.h \
 			  vty_cli.h \
 			  vty_cli_cmds.h \
-			  vty_utils.h
+			  vty_utils.h \
+			  netutils.h
 
 noinst_LIBRARIES	= libvty.a
 
 libvty_a_SOURCES	= \
 			  vty.c \
 			  vty_auth.c \
 			  vty_cli.c \
 			  vty_cli_cmds.c \
-			  vty_utils.c
+			  vty_utils.c \
+			  netutils.c
diff --git a/netutils.c b/libvty/netutils.c
similarity index 100%
rename from netutils.c
rename to libvty/netutils.c
diff --git a/netutils.h b/libvty/netutils.h
similarity index 100%
rename from netutils.h
rename to libvty/netutils.h
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 367213e7..4151546f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,61 +1,58 @@
 MAINTAINERCLEANFILES	= Makefile.in
 
 VALGRIND = valgrind -q --error-exitcode=127 --track-fds=yes --leak-check=full
 HELGRIND = valgrind -v --tool=helgrind
 
 check-valgrind: $(check_PROGRAMS)
 	$(MAKE) TESTS_ENVIRONMENT="$(VALGRIND)" check
 
 check-helgrind: $(check_PROGRAMS)
 	$(MAKE) TESTS_ENVIRONMENT="$(HELGRIND)" check
 
 noinst_PROGRAMS = \
 		  ping_test \
 		  khandle_test \
 		  lookup_bench \
 		  $(check_PROGRAMS)
 
 check_PROGRAMS = \
 		  netutils_test \
 		  listener_test \
 		  utils_test
 
 TESTS = $(check_PROGRAMS)
 
 AM_CPPFLAGS		= -DTEST \
 			  -I$(srcdir)/../ \
 			  -I$(srcdir)/../libtap/ \
-			  -I$(srcdir)/../libknet/
+			  -I$(srcdir)/../libknet/ \
+			  -I$(srcdir)/../libvty/
 
 AM_LDFLAGS		= \
 			  $(top_builddir)/libtap/libtap.la \
-			  $(top_builddir)/libknet/libknet.a
+			  $(top_builddir)/libknet/libknet.a \
+			  $(top_builddir)/libvty/libvty.a
 
 ping_test_SOURCES	= \
 			  ping_test.c \
-			  ../netutils.c \
 			  ../utils.c
 
 khandle_test_SOURCES	= \
 			  khandle_test.c \
-			  ../netutils.c \
 			  ../utils.c
 
 lookup_bench_SOURCES	= \
 			  lookup_bench.c \
-			  ../netutils.c \
 			  ../utils.c
 
 listener_test_SOURCES	= \
 			  listener_test.c \
-			  ../netutils.c \
 			  ../utils.c
 
 netutils_test_SOURCES	= \
 			  netutils_test.c \
-			  ../netutils.c \
 			  ../utils.c
 
 utils_test_SOURCES	= \
 			  utils_test.c \
 			  ../utils.c