diff --git a/Makefile.am b/Makefile.am
index 210f134..ff61d3b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,15 @@
+
+demodir = demo
+
+demo_DATA = \
+						demo/vigenere.txt \
+						demo/afine.txt \
+						demo/plaintext.txt \
+						demo/vigenere.2.txt \
+						demo/vigenere.3.txt
+
 SUBDIRS = src data doc
 
 
-EXTRA_DIST = INSTALL README doxygen.conf autogen
+EXTRA_DIST = INSTALL README doxygen.conf autogen \
+	     $(demo_DATA)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index ec554b4..0eeeffb 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -5,16 +5,6 @@ cryptafinityhtml_DATA = \
 					   html/index.html \
 					   html/cryptafinity.css 
 
-cryptafinitydemodir = $(docdir)/cryptafinity/demo
-
-cryptafinitydemo_DATA = \
-						demo/vigenere.txt \
-						demo/afine.txt \
-						demo/plaintext.txt \
-						demo/vigenere.2.txt \
-						demo/vigenere.3.txt
-
 EXTRA_DIST = \
 			 $(cryptafinityhtml_DATA)
-			 $(cryptafinitydemo_DATA)