diff --git a/.gitignore b/.gitignore
index 941a2a8..65b3cda 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,7 @@
 .idea/
 .python-version
 doc/_build
-doc/man/.doctrees
\ No newline at end of file
+doc/man/.doctrees
+*.egg-info/
+dist/
+.tox/
\ No newline at end of file
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4bc85d7..f06a36a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,17 +1,38 @@
+stages:
+  - test
+  - build
+  - deploy
+
 before_script:
   - pipenv install --sequential -d
   # --sequential hält die last auf raspberry pi unten
+
 style:
   stage: test
   script:
     - pipenv run flake8
+
 complexity:
   stage: test
   script:
     - pipenv run radon cc .
     - pipenv run xenon -bB -mA -aA .
+
 doc:
-  stage: deploy
+  stage: build
   script:
     - cd doc
     - pipenv run make html
+    - pipenv run make man
+  artifacts:
+    paths:
+      - doc/man/*
+
+
+pex:
+  stage: build
+  script:
+    - pipenv run pex . -r <(pipenv lock -r) -e carom.cli:cli -o carom-client
+  artifacts:
+    paths:
+      - dist/*
\ No newline at end of file
diff --git a/Pipfile b/Pipfile
index 9473e89..bcea968 100644
--- a/Pipfile
+++ b/Pipfile
@@ -24,6 +24,7 @@ pytest = "*"
 sphinx = "*"
 sphinx-rtd-theme = "*"
 sphinx-click = "*"
+pex = "*"
 
 [requires]
 python_version = "3.5"
diff --git a/Pipfile.lock b/Pipfile.lock
index 66be73f..f5d6bd2 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "75ffb26ae722771c07a3d001c976e6fd7092b4ab928d2c30b80ae3e4573eecd6"
+            "sha256": "bd0fbeefa6073d17fbdcf3879ed282ebcb875445ae4ea4ef2eef2c261c13094c"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -267,6 +267,14 @@
             "index": "pypi",
             "version": "==0.7.0"
         },
+        "pex": {
+            "hashes": [
+                "sha256:6143465a09ca84dc0000ffc74c6eaf8f3210e590150e115832974994479b662b",
+                "sha256:6e72c7fb480469713f8df827f8bfcbe5fac74606b7bea930f1be490d9822b54f"
+            ],
+            "index": "pypi",
+            "version": "==1.5.2"
+        },
         "pipenv": {
             "hashes": [
                 "sha256:a785235bf2ddf65ea8a91531b3372471d9ad86036335dba8bd63f20c00a68e63",
@@ -452,6 +460,13 @@
             ],
             "version": "==0.4.0"
         },
+        "wheel": {
+            "hashes": [
+                "sha256:0a2e54558a0628f2145d2fc822137e322412115173e8a2ddbe1c9024338ae83c",
+                "sha256:80044e51ec5bbf6c894ba0bc48d26a8c20a9ba629f4ca19ea26ecfcf87685f5f"
+            ],
+            "version": "==0.31.1"
+        },
         "xenon": {
             "hashes": [
                 "sha256:03c6fa6820ca260a85931cec44bd60ae60194eec7eb22f53ba160b3c9578cdf1",
diff --git a/dist/.keep b/dist/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/setup.py b/setup.py
index 4d023d3..d579d5f 100644
--- a/setup.py
+++ b/setup.py
@@ -12,4 +12,7 @@ setup(name='carom-client',
       entry_points={
           'console_scripts': ['carom-client=carom.cli:cli'],
       },
+      data_files=[
+          ('share/man/man1', ('doc/man/carom-client.1', )),
+      ],
       )
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..6deafc2
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,2 @@
+[flake8]
+max-line-length = 120