diff --git a/.travis.yml b/.travis.yml
index 91f16229e..029185328 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,15 +23,18 @@ env:
     - BUILD_TYPE=linux      PYTHON_VERSION=27     CONF=debug      ARCH=x86_64
     - BUILD_TYPE=linux      PYTHON_VERSION=34     CONF=debug      ARCH=x86_64
     - BUILD_TYPE=linux      PYTHON_VERSION=35     CONF=debug      ARCH=x86_64
+    - BUILD_TYPE=linux      PYTHON_VERSION=36     CONF=debug      ARCH=x86_64
     - BUILD_TYPE=linux      PYTHON_VERSION=pypy2  CONF=debug      ARCH=x86_64
     - BUILD_TYPE=linux      PYTHON_VERSION=27     CONF=release    ARCH=x86_64
     - BUILD_TYPE=linux      PYTHON_VERSION=34     CONF=release    ARCH=x86_64
     - BUILD_TYPE=linux      PYTHON_VERSION=35     CONF=release    ARCH=x86_64
+    - BUILD_TYPE=linux      PYTHON_VERSION=36     CONF=release    ARCH=x86_64
     - BUILD_TYPE=linux      PYTHON_VERSION=pypy2  CONF=release    ARCH=x86_64
     - BUILD_TYPE=linux      PYTHON_VERSION=27     CONF=coverage   ARCH=x86_64
     - BUILD_TYPE=manylinux  PYTHON_VERSION=27     DOCKER_IMAGE=keyvidev/keyvi-manylinux-builder
     - BUILD_TYPE=manylinux  PYTHON_VERSION=34     DOCKER_IMAGE=keyvidev/keyvi-manylinux-builder
     - BUILD_TYPE=manylinux  PYTHON_VERSION=35     DOCKER_IMAGE=keyvidev/keyvi-manylinux-builder
+    - BUILD_TYPE=manylinux  PYTHON_VERSION=36     DOCKER_IMAGE=keyvidev/keyvi-manylinux-builder
     - BUILD_TYPE=sdist      PYTHON_VERSION=27
     - BUILD_TYPE=doc
   global:
@@ -54,6 +57,10 @@ matrix:
       osx_image: xcode7.3
       compiler: clang
       env: BUILD_TYPE=osx PYTHON_VERSION=35
+    - os: osx
+      osx_image: xcode7.3
+      compiler: clang
+      env: BUILD_TYPE=osx PYTHON_VERSION=36
 # temporarily disabled pypy builds on osx
 # till https://bitbucket.org/pypy/pypy/issues/2626/invalid-conversion-from-const-char-to-char is released
 #    - os: osx
@@ -109,7 +116,7 @@ script:
 after_success:
   - if [ "$CC" = "gcc-4.8" ] && [ "$CONF" = "coverage" ] && [ "$TRAVIS_REPO_SLUG" == "$GITHUB_REPO" ]; then ./travis/coverage.sh ; fi
   - if [ "$CC" = "gcc-4.8" ] && [ "$CONF" = "coverage" ]; then ./travis/style.sh ; fi
-  - if [ "$BUILD_TYPE" == "doc" ] && [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then source ./travis/build_doc.sh ; fi
+  - if [ "$BUILD_TYPE" == "doc" ] && [ "$TRAVIS_REPO_SLUG" == "$GITHUB_REPO" ] && [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then source ./travis/build_doc.sh ; fi
 
 deploy:
   provider: script
diff --git a/travis/build_manylinux_wheels.sh b/travis/build_manylinux_wheels.sh
index 0a66a73e8..fc597076e 100755
--- a/travis/build_manylinux_wheels.sh
+++ b/travis/build_manylinux_wheels.sh
@@ -16,6 +16,9 @@ case "${PYTHON_VERSION}" in
   35)
       PYBIN=/opt/python/cp35-cp35m/bin
       ;;
+  36)
+      PYBIN=/opt/python/cp36-cp36m/bin
+      ;;
   pypy2)
       echo "pypy2 is not support at the moment, see: https://github.com/pypa/manylinux/issues/38"
       ;;
diff --git a/travis/setup_pyenv.sh b/travis/setup_pyenv.sh
index ae56d30f1..c222b9e8a 100755
--- a/travis/setup_pyenv.sh
+++ b/travis/setup_pyenv.sh
@@ -34,6 +34,10 @@ case "${PYTHON_VERSION}" in
       pyenv install 3.5.2
       pyenv global 3.5.2
       ;;
+  36)
+      pyenv install 3.6.4
+      pyenv global 3.6.4
+      ;;
   pypy2)
       pyenv install pypy-5.3.1
       pyenv global pypy-5.3.1