diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -35,12 +35,6 @@ AC_CHECK_FUNCS([strdup])
 AC_CHECK_HEADERS([fcntl.h])
 AC_CHECK_HEADERS([malloc.h])
 
-# TODO: write up --with-list option
-AC_CHECK_HEADERS([list.h queue.h stack.h], [], [AC_MSG_ERROR([I need liblist to be installed])])
-AC_CHECK_LIB([list], [list_init], [
-   AC_SUBST([LIST_LIBS],[-llist])], [
-   AC_MSG_ERROR([I need liblist to be installed]) ])
-
 AC_FUNC_FORK
 AC_FUNC_MALLOC
 
@@ -64,21 +58,13 @@ AC_DEFINE([_GNU_SOURCE], [1])
 PKG_PROG_PKG_CONFIG(0.17.2)
 
 
-PKGCONFIG_OHNOWRAP([DISTLIBS], [libconfuse >= 2.5 libcurl libxml-2.0])
+PKGCONFIG_OHNOWRAP([DISTLIBS], [libconfuse >= 2.5 libcurl libxml-2.0 liblist >= 2.2.1])
 
 PKGCONFIG_OHNOWRAP([CHECK], [check >= 0.9.3])
 
-AC_DEFINE_DIR([SYSCONFDIR], [sysconfdir], [Directory to find configuration files in])
-AC_DEFINE_DIR([LOCALSTATEDIR], [localstatedir], [Directory in which the server or client may store its state files and data])
-AC_DEFINE_DIR([RUNSTATEDIR], [localstatedir/run], [Directory where PID files are stored])
-
 AC_CONFIG_FILES([Makefile
 src/Makefile
-src/common/Makefile
-src/server/Makefile
-src/client/Makefile
 src/tests/Makefile
-etc/Makefile
 etc/distrendaemon.conf
 etc/distrenslave.conf
 ])