diff --git a/configure.in b/configure.in
index 94bc240..9b38d41 100644
--- a/configure.in
+++ b/configure.in
@@ -18,6 +18,7 @@
 
 AC_OUTPUT(
     include/openbsc/Makefile
+    include/vty/Makefile
     include/Makefile
     src/Makefile
     tests/Makefile
diff --git a/include/Makefile.am b/include/Makefile.am
index 0de9178..36d57a3 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = openbsc
+SUBDIRS = openbsc vty
 
 noinst_HEADERS = mISDNif.h
diff --git a/include/vty/Makefile.am b/include/vty/Makefile.am
new file mode 100644
index 0000000..1674766
--- /dev/null
+++ b/include/vty/Makefile.am
@@ -0,0 +1 @@
+noinst_HEADERS = buffer.h command.h  vector.h vty.h
diff --git a/src/Makefile.am b/src/Makefile.am
index b9e9427..b9b3892 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,6 +3,7 @@
 
 sbin_PROGRAMS = bsc_hack bs11_config ipaccess-find
 noinst_LIBRARIES = libbsc.a libvty.a
+noinst_HEADERS = vty/cardshell.h
 
 libbsc_a_SOURCES = abis_rsl.c abis_nm.c gsm_04_08.c gsm_data.c \
 		gsm_subscriber.c msgb.c select.c chan_alloc.c timer.c debug.c db.c \