diff --git a/.gitignore b/.gitignore
index 4bab156..a0bf4b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,7 @@ myconfig.sh
 latan/IOASCIILexer.cpp
 latan/IOASCIIParser.cpp
 latan/IOASCIIParser.hpp
+
+# Eigen headers
+latan/Eigen/*
+latan/eigen_files.mk
diff --git a/bootstrap.sh b/bootstrap.sh
index 2d8caa3..5dd5179 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+echo "extracting Eigen headers..."
+./update_eigen.sh eigen-eigen-*.tar.bz2
 rm -rf .buildutils
 mkdir -p .buildutils/m4
 autoreconf -fvi
diff --git a/eigen-eigen-ffa86ffb5570.tar.bz2 b/eigen-eigen-ffa86ffb5570.tar.bz2
new file mode 100644
index 0000000..ae6f7f1
Binary files /dev/null and b/eigen-eigen-ffa86ffb5570.tar.bz2 differ
diff --git a/latan/Makefile.am b/latan/Makefile.am
index 1c097ac..91b366b 100644
--- a/latan/Makefile.am
+++ b/latan/Makefile.am
@@ -17,6 +17,9 @@ endif
 AM_LFLAGS = -olex.yy.c
 AM_YFLAGS = -d
 
+include eigen_files.mk
+nobase_dist_pkginclude_HEADERS = $(eigen_files)
+
 BUILT_SOURCES = IOASCIIParser.hpp
 
 lib_LTLIBRARIES = liblatan.la
@@ -32,7 +35,7 @@ liblatan_la_SOURCES =  \
     Mat.cpp            \
     Sample.cpp         \
 	../config.h
-liblatan_ladir = $(includedir)/latan
+liblatan_ladir = $(pkgincludedir)
 liblatan_la_HEADERS = \
     Global.hpp        \
     IO.hpp            \
diff --git a/update_eigen.sh b/update_eigen.sh
index d6f1010..1620288 100755
--- a/update_eigen.sh
+++ b/update_eigen.sh
@@ -6,10 +6,13 @@ fi
 ARC=$1
 
 INITDIR=`pwd`
+rm -rf latan/Eigen
 ARCDIR=`tar -tf ${ARC} | head -n1 | sed -e 's@/.*@@'`
 tar -xf ${ARC}
 cd ${ARCDIR}
-rm -rf latan/Eigen
-tar -cf - Eigen --exclude='*.txt' | tar -xvf - -C ../latan/
+tar -cf - Eigen --exclude='*.txt' | tar -xf - -C ../latan/
+cd ../latan
+echo 'eigen_files =\' > eigen_files.mk
+find Eigen -type f -print | sed 's/^/  /;$q;s/$/ \\/' >> eigen_files.mk
 cd ${INITDIR}
 rm -rf ${ARCDIR}