diff --git a/setup.py b/setup.py
index 09891a1559918003fd8b610f3a0fb2a8cf703ef9..87468821b9081e4673d460f2eb0560a90b559545 100644
--- a/setup.py
+++ b/setup.py
@@ -1,9 +1,16 @@
 from setuptools import setup, find_packages
+import glob
+import os
 
 version = '0.1'
 name = 'slapos.recipebox'
 long_description = open("README.txt").read() + "\n" + \
-    open("CHANGES.txt").read()
+    open("CHANGES.txt").read() + "\n"
+
+for f in glob.glob(os.path.join('slapos', 'recipe', 'README.*.txt')):
+  subname = os.path.basename(f)
+  long_description += subname + '\n' + '=' * len(subname) + '\n\n' \
+    + open(f).read() + '\n'
 
 setup(name=name,
       version=version,
@@ -23,4 +30,9 @@ setup(name=name,
         'zc.buildout', # needed to play internally
         ],
       zip_safe=True,
+      entry_points={
+        'zc.buildout': [
+          'build = slapos.recipe.build:Script',
+          'buildcmmi = slapos.recipe.build:Cmmi',
+      ]},
     )
diff --git a/slapos/slapos.recipe.build/README.txt b/slapos/recipe/README.build.txt
similarity index 100%
rename from slapos/slapos.recipe.build/README.txt
rename to slapos/recipe/README.build.txt
diff --git a/slapos/slapos.recipe.build/src/slapos/recipe/build/__init__.py b/slapos/recipe/build.py
similarity index 100%
rename from slapos/slapos.recipe.build/src/slapos/recipe/build/__init__.py
rename to slapos/recipe/build.py
diff --git a/slapos/slapos.recipe.build/CHANGES.txt b/slapos/slapos.recipe.build/CHANGES.txt
deleted file mode 100644
index 8a64d92fd358c961676f8038de74469e8fe7f6c0..0000000000000000000000000000000000000000
--- a/slapos/slapos.recipe.build/CHANGES.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-1.0 (unreleased)
-----------------
-
- - initial release [Łukasz Nowak]
diff --git a/slapos/slapos.recipe.build/MANIFEST.in b/slapos/slapos.recipe.build/MANIFEST.in
deleted file mode 100644
index 1a2a20568355c7fbcd4988589dca0386a83a4ebd..0000000000000000000000000000000000000000
--- a/slapos/slapos.recipe.build/MANIFEST.in
+++ /dev/null
@@ -1 +0,0 @@
-include CHANGES.txt
diff --git a/slapos/slapos.recipe.build/setup.cfg b/slapos/slapos.recipe.build/setup.cfg
deleted file mode 100644
index 0c3455bc479bfc7e6771d88e803f423cb3d9e59a..0000000000000000000000000000000000000000
--- a/slapos/slapos.recipe.build/setup.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-[egg_info]
-tag_build = .dev
-tag_svn_revision = 1
diff --git a/slapos/slapos.recipe.build/setup.py b/slapos/slapos.recipe.build/setup.py
deleted file mode 100644
index 3f314ab2918825ae3c120c2b4031fa430e3086f0..0000000000000000000000000000000000000000
--- a/slapos/slapos.recipe.build/setup.py
+++ /dev/null
@@ -1,31 +0,0 @@
-from setuptools import setup, find_packages
-
-version = '1.0'
-name = 'slapos.recipe.build'
-long_description = open("README.txt").read() + "\n" + \
-    open("CHANGES.txt").read()
-
-setup(name=name,
-      version=version,
-      description="Simple download recipe",
-      long_description=long_description,
-      classifiers=[
-          "Framework :: Buildout :: Recipe",
-          "Programming Language :: Python",
-        ],
-      keywords='slapos recipe build',
-      license='GPLv3',
-      namespace_packages=['slapos'],
-      packages=find_packages('src'),
-      package_dir={'': 'src'},
-      include_package_data=True,
-      install_requires=[
-        'setuptools', # for namespace and internal usage
-        'zc.buildout', # needed to play internally
-        ],
-      entry_points={'zc.buildout': [
-        'default = %s:Script' % name,
-        'cmmi = %s:Cmmi' % name,
-        ]},
-      zip_safe=True,
-    )
diff --git a/slapos/slapos.recipe.build/src/slapos/__init__.py b/slapos/slapos.recipe.build/src/slapos/__init__.py
deleted file mode 100644
index 5761d9e13e775450862541d9785977e8b7b6c7b3..0000000000000000000000000000000000000000
--- a/slapos/slapos.recipe.build/src/slapos/__init__.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# See http://peak.telecommunity.com/DevCenter/setuptools#namespace-packages
-try:
-    __import__('pkg_resources').declare_namespace(__name__)
-except ImportError:
-    from pkgutil import extend_path
-    __path__ = extend_path(__path__, __name__)
-
diff --git a/slapos/slapos.recipe.build/src/slapos/recipe/__init__.py b/slapos/slapos.recipe.build/src/slapos/recipe/__init__.py
deleted file mode 100644
index 5761d9e13e775450862541d9785977e8b7b6c7b3..0000000000000000000000000000000000000000
--- a/slapos/slapos.recipe.build/src/slapos/recipe/__init__.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# See http://peak.telecommunity.com/DevCenter/setuptools#namespace-packages
-try:
-    __import__('pkg_resources').declare_namespace(__name__)
-except ImportError:
-    from pkgutil import extend_path
-    __path__ = extend_path(__path__, __name__)
-