diff --git a/Makefile b/Makefile
index b051289f73b2f93bbe801b12f251b423f350731c..b61cde5e81440f69f102f6a32e7e99552257e518 100644
--- a/Makefile
+++ b/Makefile
@@ -13,10 +13,10 @@ doc: doc/mkexp.pdf
 check:
 	python test.py -v
 
-dist:
+dist: doc
 	python setup.py sdist
 
-install: all
+install: doc
 	python setup.py install --prefix=$(prefix)
 
 .PHONY: all clean distclean doc check dist install
diff --git a/setup.py b/setup.py
index cc146030df3473651ea449e156585e0c0d4edac2..1879326e894f1e931339ecba734671b23d24944d 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 from distutils.core import setup
 
 name = 'mkexp'
-version = '0.3.1dev'
+version = '0.3.1'
 
 setup(
     name = name,
@@ -13,6 +13,7 @@ setup(
     url = 'http://code.zmaw.de/projects/esmenv',
     py_modules = ['configobj', 'validate', 'feedback', 'expconfig'],
     scripts = ['mkexp', 'getexp', 'rmexp', 'diffexp', 'diffpath'],
+    data_files = [('share/doc/'+name, ['doc/mkexp.pdf'])],
     platforms = ['Posix'],
     license = 'LICENSE.txt',
     requires = ['Jinja2(>= 2.6)']