diff --git a/.gitignore b/.gitignore
index 5bfac94..d69c819 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,10 +3,12 @@
 /autom4te.cache/
 /compile
 /config.h.in
-/config.h.in~
+/config.guess
+/config.sub
 /configure
 /depcomp
 /install-sh
+/ltmain.sh
 /missing
 Makefile.in
 
diff --git a/Makefile.am b/Makefile.am
index cebb369..79691c5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,4 +4,4 @@ MAINTAINERCLEANFILES = \
 	depcomp install-sh missing \
 	Makefile.in */Makefile.in
 
-SUBDIRS = src
+SUBDIRS = lib src
diff --git a/configure.ac b/configure.ac
index 3a46fbd..ca428cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,6 +13,8 @@ define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl
 define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
 define([AC_LIBTOOL_LANG_GCJ_CONFIG], [:])dnl
 
+LT_INIT()
+
 AC_C_BIGENDIAN
 AC_C_CONST
 AC_C_INLINE
@@ -33,6 +35,7 @@ AC_SUBST(CFLAGS_WARN)
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_FILES([
 Makefile
+lib/Makefile
 src/Makefile
 ])
 AC_OUTPUT
diff --git a/lib/Makefile.am b/lib/Makefile.am
new file mode 100644
index 0000000..0360000
--- /dev/null
+++ b/lib/Makefile.am
@@ -0,0 +1,6 @@
+noinst_LTLIBRARIES = libnvt.la
+
+libnvt_la_CFLAGS = $(CFLAGS_WARN)
+
+libnvt_la_SOURCES  = nvt_log.c nvt_log.h
+libnvt_la_SOURCES += nvt_socket.c nvt_socket.h
diff --git a/src/nvt_log.c b/lib/nvt_log.c
similarity index 100%
rename from src/nvt_log.c
rename to lib/nvt_log.c
diff --git a/src/nvt_log.h b/lib/nvt_log.h
similarity index 100%
rename from src/nvt_log.h
rename to lib/nvt_log.h
diff --git a/src/nvt_socket.c b/lib/nvt_socket.c
similarity index 100%
rename from src/nvt_socket.c
rename to lib/nvt_socket.c
diff --git a/src/nvt_socket.h b/lib/nvt_socket.h
similarity index 100%
rename from src/nvt_socket.h
rename to lib/nvt_socket.h
diff --git a/src/Makefile.am b/src/Makefile.am
index b152449..206cdb6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,10 +3,8 @@ bin_PROGRAMS = ttynvt
 
 ttynvt_SOURCES = \
 	ttynvt.c \
-	nvt_log.c nvt_log.h \
-	nvt_socket.c nvt_socket.h \
 	telnet_basic.c telnet_rfc2217.c telnet.h telnet_param.h
 
-ttynvt_CPPFLAGS = -I$(top_builddir) $(FUSE_CFLAGS) $(CFLAGS_WARN)
+ttynvt_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) $(FUSE_CFLAGS) $(CFLAGS_WARN)
 
-ttynvt_LDADD = $(FUSE_LIBS)
+ttynvt_LDADD = $(top_builddir)/lib/libnvt.la $(FUSE_LIBS)
diff --git a/src/ttynvt.c b/src/ttynvt.c
index 52437e2..e4e2550 100644
--- a/src/ttynvt.c
+++ b/src/ttynvt.c
@@ -24,8 +24,8 @@
 #include <netinet/in.h>
 #include <sys/ioctl.h>
 
-#include "nvt_log.h"
-#include "nvt_socket.h"
+#include "lib/nvt_log.h"
+#include "lib/nvt_socket.h"
 #include "telnet.h"
 
 #define NET_BUF_SIZE 1024