diff --git a/Makefile.am b/Makefile.am
index e787d42..03d2b7c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-## kdepim/kpilot/Makefile.am
+## Makefile.am
 ## (C) 1997 Stephan Kulow
 ## Modified by Adriaan de Groot
 
diff --git a/conduits/abbrowserconduit/Makefile.am b/conduits/abbrowserconduit/Makefile.am
index b012765..6985522 100644
--- a/conduits/abbrowserconduit/Makefile.am
+++ b/conduits/abbrowserconduit/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes)
+INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/lib $(all_includes)
 
 kde_module_LTLIBRARIES = conduit_address.la
 
diff --git a/conduits/docconduit/Makefile.am b/conduits/docconduit/Makefile.am
index 77df2b6..ade1c66 100644
--- a/conduits/docconduit/Makefile.am
+++ b/conduits/docconduit/Makefile.am
@@ -5,7 +5,7 @@
 
 SUBDIRS = Icons
 
-INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes)
+INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/lib $(all_includes)
 METASOURCES = AUTO
 
 
diff --git a/conduits/knotes/Makefile.am b/conduits/knotes/Makefile.am
index db4cff3..b13a2ff 100644
--- a/conduits/knotes/Makefile.am
+++ b/conduits/knotes/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir) -I$(top_srcdir)/kpilot/lib $(all_includes)
+INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir) -I$(top_srcdir)/lib $(all_includes)
 
 METASOURCES = AUTO
 
diff --git a/conduits/malconduit/Makefile.am b/conduits/malconduit/Makefile.am
index d8a2224..df5ed04 100644
--- a/conduits/malconduit/Makefile.am
+++ b/conduits/malconduit/Makefile.am
@@ -3,7 +3,7 @@
 ### The mal conduit is Copyright (C) 2002 by Reinhold Kainhofer
 
 
-INCLUDES= $(PISOCK_INCLUDE)  $(MAL_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes)
+INCLUDES= $(PISOCK_INCLUDE)  $(MAL_INCLUDE) -I$(top_srcdir)/lib $(all_includes)
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
diff --git a/conduits/memofileconduit/Makefile.am b/conduits/memofileconduit/Makefile.am
index e4a244b..1f51105 100644
--- a/conduits/memofileconduit/Makefile.am
+++ b/conduits/memofileconduit/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes)
+INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/lib $(all_includes)
 
 METASOURCES = AUTO
 
diff --git a/conduits/notepadconduit/Makefile.am b/conduits/notepadconduit/Makefile.am
index d50e4fd..7a052da 100644
--- a/conduits/notepadconduit/Makefile.am
+++ b/conduits/notepadconduit/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes)
+INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/lib $(all_includes)
 
 METASOURCES = AUTO
 
diff --git a/conduits/null/Makefile.am b/conduits/null/Makefile.am
index c1057b4..783e881 100644
--- a/conduits/null/Makefile.am
+++ b/conduits/null/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes)
+INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/lib $(all_includes)
 
 METASOURCES = AUTO
 
diff --git a/conduits/popmail/Makefile.am b/conduits/popmail/Makefile.am
index 0e56580..5b6becd 100644
--- a/conduits/popmail/Makefile.am
+++ b/conduits/popmail/Makefile.am
@@ -1,7 +1,7 @@
 ### Makefile for the popmail conduit
 ###
 
-INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes)
+INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/lib $(all_includes)
 METASOURCES = AUTO
 
 servicedir  = $(kde_servicesdir)
diff --git a/conduits/recordconduit/Makefile.am b/conduits/recordconduit/Makefile.am
index 33ceb85..9fd691e 100644
--- a/conduits/recordconduit/Makefile.am
+++ b/conduits/recordconduit/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes)
+INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/lib $(all_includes)
 
 METASOURCES = AUTO
 
diff --git a/conduits/sysinfoconduit/Makefile.am b/conduits/sysinfoconduit/Makefile.am
index eb7f7aa..b89b4df 100644
--- a/conduits/sysinfoconduit/Makefile.am
+++ b/conduits/sysinfoconduit/Makefile.am
@@ -2,7 +2,7 @@
 ###
 ### The sysinfo conduit is Copyright (C) 2003 by Reinhold Kainhofer
 
-INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes)
+INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/lib $(all_includes)
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
diff --git a/conduits/timeconduit/Makefile.am b/conduits/timeconduit/Makefile.am
index 6a58716..8c9ae93 100644
--- a/conduits/timeconduit/Makefile.am
+++ b/conduits/timeconduit/Makefile.am
@@ -2,7 +2,7 @@
 ###
 ### The time conduit is Copyright (C) 2002 by Reinhold Kainhofer
 
-INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes)
+INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/lib $(all_includes)
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
diff --git a/conduits/vcalconduit/Makefile.am b/conduits/vcalconduit/Makefile.am
index 546789e..4f0dcd8 100644
--- a/conduits/vcalconduit/Makefile.am
+++ b/conduits/vcalconduit/Makefile.am
@@ -3,7 +3,7 @@
 ### so it seems logical to put them in one place.
 ###
 
-INCLUDES= -I$(top_srcdir)/kpilot/lib -I$(top_srcdir) \
+INCLUDES= -I$(top_srcdir)/lib -I$(top_srcdir) \
 	$(PISOCK_INCLUDE) $(all_includes)
 
 METASOURCES = AUTO
diff --git a/configure.in.in b/configure.in.in
index 863e3e4..2678141 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -1,3 +1,34 @@
+#MIN_CONFIG(3.3)
+AC_HEADER_DIRENT
+AC_HEADER_STDC
+AC_CHECK_HEADERS(fcntl.h sys/sysctl.h sys/param.h sys/time.h sys/types.h unistd.h values.h sys/limits.h err.h sys/cdefs.h)
+
+AC_CHECK_SETENV
+AC_CHECK_UNSETENV
+
+KDE_NEED_FLEX
+
+if test "$x_includes" != "NONE"; then
+  AC_DEFINE(HAVE_X11_HEADERS,1,Define if you have X11 header files)
+fi
+AC_CHECK_LIB(Xtst, XTestFakeKeyEvent, [LIBXTST=-lXtst],, -lX11)
+AC_SUBST(LIBXTST)
+if test "$LIBXTST" != ""; then
+  AC_CHECK_HEADER([X11/extensions/XTest.h],
+                  [AC_DEFINE(HAVE_XTEST, 1, [Define if you have X11 Xtest header files])])
+fi
+
+KDE_INIT_DOXYGEN([KDE PIM API Reference], [Version $VERSION])
+
+KDE_CHECK_THREADING
+
+dnl For apps that NEED threads
+if test -z "$LIBPTHREAD" && test -z "$USE_THREADS"; then
+  DO_NOT_COMPILE="$DO_NOT_COMPILE knode"
+fi
+
+CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
+
 dnl Configure.in.in for KPilot.
 dnl
 dnl Copyright (C) 2000,2001 Adriaan de Groot
diff --git a/kpilot/Makefile.am b/kpilot/Makefile.am
index a5b4909..36d0833 100644
--- a/kpilot/Makefile.am
+++ b/kpilot/Makefile.am
@@ -15,7 +15,7 @@ kde_module_LTLIBRARIES = kcm_kpilot.la
 
 METASOURCES = AUTO
 
-INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes)
+INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/lib $(all_includes)
 
 libconfiguration_la_SOURCES = kpilotConfig.cc kpilotSettings.kcfgc
 libconfiguration_la_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries)
diff --git a/lib/Makefile.am b/lib/Makefile.am
index b2ceadf..e17de18 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -29,7 +29,7 @@ libkpilot_la_SOURCES = kpilotlibSettings.kcfgc \
 	pilotTodoEntry.cc
 
 libkpilot_la_LDFLAGS = $(PISOCK_LDFLAGS) -no-undefined $(all_libraries) $(KDE_EXTRA_RPATH) $(KDE_RPATH)
-libkpilot_la_LIBADD = $(PISOCK_LIB) $(LIB_KDEUI) $(LIB_KABC) $(top_builddir)/libkcal/libkcal.la
+libkpilot_la_LIBADD = $(PISOCK_LIB) $(LIB_KDEUI) $(LIB_KABC) -lkcal
 
 kpilotincludedir = $(includedir)/kpilot
 kpilotinclude_HEADERS = \