diff --git a/build.py b/build.py
new file mode 100644
index 0000000..253bb2c
--- /dev/null
+++ b/build.py
@@ -0,0 +1,29 @@
+import argparse
+import subprocess
+
+
+def main():
+    parser = argparse.ArgumentParser("Build script for pypi and pypi test")
+    group = parser.add_mutually_exclusive_group(required=True)
+    group.add_argument(
+        '--test',
+        action='store_true',
+        help='Build to test.pypi.org'
+    )
+    group.add_argument(
+        '--re',
+        action='store_true',
+        help='Build to pypi.org'
+    )
+
+    args = parser.parse_args()
+
+    subprocess.call(['python3', 'setup.py', 'sdist', 'bdist_wheel'])
+    if args.test:
+        subprocess.call(['twine', 'upload', '--config-file', '.pypirc', '--repository', 'testpypi', 'dist/*'])
+    elif args.re:
+        subprocess.call(['twine', 'upload', '--config-file', '.pypirc', '--repository', 'pypi', 'dist/*'])
+
+
+if __name__ == '__main__':
+    main()
diff --git a/setup.py b/setup.py
index 3812b02..2c159e3 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@ with open('README.rst', 'r') as fh:
 
 setup(
     name='pi3-smart-workspace',
-    version='0.1.0',
+    version='0.1.1',
     packages=['pi3'],
     url='https://github.com/GeneralDenmark/PyOutputHandler',
     license='Apache-2.0 License ',