diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..0254048
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,2 @@
+global-exclude .gitignore
+global-exclude .DS_Store
\ No newline at end of file
diff --git a/conf/zms3.formulator.metaobj.xml b/conf/zms3.formulator.metaobj.xml
index 78152bd..bb7f7a4 100644
--- a/conf/zms3.formulator.metaobj.xml
+++ b/conf/zms3.formulator.metaobj.xml
@@ -1126,7 +1126,7 @@ textarea.form-control.rawJSON {
           <item key="id"><![CDATA[zms3.formulator]]></item>
           <item key="name"><![CDATA[zms3.formulator]]></item>
           <item key="package"></item>
-          <item key="revision"><![CDATA[3.3.5]]></item>
+          <item key="revision"><![CDATA[3.4.0dev]]></item>
           <item key="type"><![CDATA[ZMSPackage]]></item>
         </dictionary>
       </item>
diff --git a/setup.py b/setup.py
index 1d16f46..bee79ba 100644
--- a/setup.py
+++ b/setup.py
@@ -20,12 +20,13 @@
 import os
 import sys
 from setuptools import setup
+from setuptools import find_packages
 
 for path in sys.path:
   if path.startswith(sys.prefix) and path.endswith('site-packages'):
     site_packages = path
 
-VERSION = '3.3.5'
+VERSION = '3.4.0dev'
 
 zmspkg_name = 'formulator'
 branch_name = 'master'
@@ -67,26 +68,10 @@
   (os.path.join(site_packages, 'zms3/formulator/conf'), ['conf/zms3.formulator.metaobj.xml']),
 ]
 
-PACKAGE_DATA = []
-# Exclude special folders and files
-for dirpath, dirnames, filenames in os.walk('.'):
-  if (
-    '.'                           != dirpath and
-    '.settings'                   not in dirpath and
-    '.git'                        not in dirpath and
-    'dist'                        not in dirpath and
-    'json-editor'                 not in dirpath and
-    'select2'                     not in dirpath
-    ): 
-    if filenames: 
-      for filename in filenames:
-        if filename != '.DS_Store' and filename != '.gitignore':
-          PACKAGE_DATA.append(dirpath[2:]+'/%s' % filename)
-# Include files from root path (because '.' is exclude above)
-PACKAGE_DATA.append('*.txt')
+PACKAGE_DATA = find_packages()
 
 CLASSIFIERS = [
-  'Development Status :: 4 - Beta',
+  'Development Status :: 3 - Alpha',
   'Framework :: Zope2',
   'Programming Language :: Python :: 2.7',
   'Operating System :: OS Independent',