diff --git a/Makefile.am b/Makefile.am
index 2199c6a..98cba44 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@
 ACLOCAL_AMFLAGS = -I m4
 
 # Subdirectories
-SUBDIRS = . src pyext test examples scripts
+SUBDIRS = . src pyext test caldb models examples scripts
 
 #
 INCLUDES =
@@ -37,34 +37,6 @@ doc_DATA = \
 	   README
 docdir = ${datadir}/doc/${PACKAGE}
 
-# Models installed in the package's model directory
-models      = test/data/crab.xml \
-              test/data/disk.xml \
-              test/data/gauss.xml \
-              test/data/shell.xml
-modelsdir   = $(datadir)/models
-models_DATA = $(models)
-
-# Calibration files to distribute
-irfs = caldb/kb_A_50h_v3.dat \
-       caldb/kb_B_50h_v3.dat \
-       caldb/kb_C_50h_v3.dat \
-       caldb/kb_D_50h_v3.dat \
-       caldb/kb_E_50h_v3.dat \
-       caldb/kb_F_50h_v3.dat \
-       caldb/kb_G_50h_v3.dat \
-       caldb/kb_H_50h_v3.dat \
-       caldb/kb_I_50h_v3.dat \
-       caldb/kb_J_50h_v3.dat \
-       caldb/kb_K_50h_v3.dat \
-       caldb/kb_NA_50h_v3.dat \
-       caldb/kb_NB_50h_v3.dat
-caldbdir = $(datadir)/caldb/cta
-caldb_DATA = $(irfs)
-
-# Extra files to be distributed in the tar file
-EXTRA_DIST = $(irfs) $(models)
-
 install-data-local: $(HTML_INSTALL_DATA_TARGETS)
 
 uninstall-local: $(HTML_UNINSTALL_DATA_TARGETS)
diff --git a/configure.ac b/configure.ac
index ac506f7..a24abc1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -331,6 +331,8 @@ AC_CONFIG_FILES([Makefile
                  test/Makefile
                  pyext/Makefile
                  pyext/setup.py
+                 caldb/Makefile
+                 models/Makefile
                  examples/Makefile
                  scripts/Makefile
                  ctatools.pc])