diff --git a/cms/__init__.py b/cms/__init__.py
index 171c39b2447..827c35dccfa 100644
--- a/cms/__init__.py
+++ b/cms/__init__.py
@@ -1,4 +1,4 @@
-VERSION = (2, 1, 0, 'alpha')
+VERSION = (2, 1, 0, 'beta2')
 if VERSION[-1] != "final":
     __version__ = '.'.join(map(str, VERSION))
 else:
diff --git a/cms/apphook_pool.py b/cms/apphook_pool.py
index a76e7c4b1a4..39306b9f4e9 100644
--- a/cms/apphook_pool.py
+++ b/cms/apphook_pool.py
@@ -55,6 +55,6 @@ def get_apphook(self, app_name):
             for app in self.apps.values():
                 if app_name in app.urls:
                     return app
-        raise ImproperlyConfigured('No registered apphook `%s` found.')
+        raise ImproperlyConfigured('No registered apphook `%s` found.' % app_name)
 
 apphook_pool = ApphookPool()
diff --git a/setup.py b/setup.py
index ac9776023d2..63abd416d1c 100644
--- a/setup.py
+++ b/setup.py
@@ -53,14 +53,15 @@
             'plugins/*/templates/cms/plugins/*.html',
             'plugins/*/templates/cms/plugins/*/*.html',
             'plugins/*/templates/cms/plugins/*/*.js',
-            'locale/*/LC_MESSAGES/*'
+            'locale/*/LC_MESSAGES/*',
+            'docs/*.txt'
         ] + media_files,
         'example': [
+            'media/css/*.css',
+            'media/img/*.jpg',
             'templates/*.html',
-            'store/templates/store/plugins/*.html',
             'sampleapp/media/sampleapp/img/gift.jpg',
             'sampleapp/templates/sampleapp/*.html',
-            'categories/templates/categories/*.html',
         ],
         'menus': [
             'templates/menu/*.html',