diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..57fcb6e
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,4 @@
+recursive-include mandaye/templates *.html
+recursive-include mandaye/static *
+include mandaye/alembic.ini
+recursive-include mandaye/alembic *
diff --git a/alembic.ini b/mandaye/alembic.ini
similarity index 100%
rename from alembic.ini
rename to mandaye/alembic.ini
diff --git a/alembic/README b/mandaye/alembic/README
similarity index 100%
rename from alembic/README
rename to mandaye/alembic/README
diff --git a/alembic/env.py b/mandaye/alembic/env.py
similarity index 100%
rename from alembic/env.py
rename to mandaye/alembic/env.py
diff --git a/alembic/script.py.mako b/mandaye/alembic/script.py.mako
similarity index 100%
rename from alembic/script.py.mako
rename to mandaye/alembic/script.py.mako
diff --git a/alembic/versions/913dfa11ef_initial_tables.py b/mandaye/alembic/versions/913dfa11ef_initial_tables.py
similarity index 100%
rename from alembic/versions/913dfa11ef_initial_tables.py
rename to mandaye/alembic/versions/913dfa11ef_initial_tables.py
diff --git a/mandaye/global_config.py b/mandaye/global_config.py
index 38074a4..888efcc 100644
--- a/mandaye/global_config.py
+++ b/mandaye/global_config.py
@@ -71,8 +71,8 @@ hosts = {
             ],
         }
 
-alembic_cfg = os.path.join(_PROJECT_PATH, 'alembic.ini')
-alembic_script_path = os.path.join(_PROJECT_PATH, 'alembic')
+alembic_cfg = os.path.join(_PROJECT_PATH, 'mandaye/alembic.ini')
+alembic_script_path = os.path.join(_PROJECT_PATH, 'mandaye/alembic')
 
 # beaker session configuration
 session_opts = {
diff --git a/setup.py b/setup.py
index 4051e77..44b478b 100644
--- a/setup.py
+++ b/setup.py
@@ -34,8 +34,8 @@ setup(name="mandaye",
       maintainer="Jerome Schneider",
       maintainer_email="jschneider@entrouvert.com",
       scripts=['scripts/mandaye'],
+      include_package_data = True,
       packages=find_packages(),
-      package_data={},
       install_requires=install_requires
 )