diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f5fc52b301cbf2af7f2796f423aedd089a38ddea..7af2fa4c7f71374c9bc77861617e0a0b78b9d0ce 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,6 +5,7 @@ stages:
   - test
   - deploy
 
+
 mirror repository:
     stage: build
     only:
@@ -24,6 +25,7 @@ mirror repository:
       - cd $(mktemp -d); git clone --bare $ORIGIN_URL .
       - for REPO in $REPOS; do git push --mirror $REPO; done
 
+
 build package:
   stage: build
   script:
@@ -39,12 +41,14 @@ check whitespace style:
   script: ./check_whitespace
   allow_failure: true
 
+
 check for dependencies installed:
   stage: test
   script:
     - if [ -d .eggs ]; then echo "$(ls -d .eggs/*/) downloaded by build, update build environment" >&2; fi
   allow_failure: true
 
+
 build documentation:
   stage: test
   script:
@@ -54,6 +58,7 @@ build documentation:
       - doc/build/html/
     expire_in: 1 month
 
+
 run tests:
   stage: test
   script:
@@ -62,6 +67,7 @@ run tests:
     paths:
       - htmlcov
 
+
 check for broken links in doc:
   stage: test
   script:
@@ -69,6 +75,25 @@ check for broken links in doc:
   allow_failure: true
 
 
+create conda package:
+  stage: deploy
+  only:
+    - master
+  image: condaforge/linux-anvil
+  script:
+    - yum install -y devtoolset-2-gcc-gfortran
+    - git clone https://gitlab.kwant-project.org/kwant/conda-recipes.git
+    - conda config --add channels kwant
+    - conda build --python 3.4 conda-recipes/kwant-dev
+    - conda build --python 3.5 conda-recipes/kwant-dev
+    - conda build --python 3.6 conda-recipes/kwant-dev
+    - mv /opt/conda/conda-bld/linux-64/kwant-dev*.tar.bz2 .
+    - anaconda --token=$ANACONDA_TOKEN upload --force kwant-dev*tar.bz2
+  artifacts:
+    paths:
+      - kwant-dev*.tar.bz2
+
+
 upload coverage:
   stage: deploy
   only:
@@ -86,6 +111,7 @@ upload coverage:
   after_script:
     - rm -rf ~/.ssh
 
+
 remove_coverage:
   stage: deploy
   only:
@@ -154,6 +180,7 @@ upload dev version docs:
   after_script:
     - rm -rf ~/.ssh
 
+
 upload docs of tagged build:
   stage: deploy
   environment: