diff --git a/.gitignore b/.gitignore
index e31152a..28a415f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@ Makefile.in
 /py-compile
 /test-driver
 /ylwrap
+/build
 
 /autom4te.cache
 /autoscan.log
diff --git a/.travis.yml b/.travis.yml
index 92ddb1f..d9b2ae8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ language: cpp
 matrix:
   include:
     - os: linux
-      env: IMAGE=ubuntu:rolling COMMAND=build_linux_gcc_coverall_ubuntu
+      env: IMAGE=ubuntu:rolling COMMAND=build_linux_gcc_coverall_ubuntu RELEASE_FILES="$TRAVIS_BUILD_DIR/build/*.xz"
       services: docker
     - os: linux
       env: IMAGE=i386/ubuntu:rolling COMMAND=build_linux_gcc_ubuntu_i386
@@ -32,9 +32,9 @@ matrix:
         - if [[ "$RELEASE_FILES" != "" ]]; then ls -l $RELEASE_FILES          ; fi
       services: docker
     - os: linux
-      env: IMAGE=x86_64 COMMAND=make_py_wheel_tf
+      env: IMAGE=x86_64 COMMAND=make_py_wheel_tf RELEASE_FILES="$TRAVIS_BUILD_DIR/tensorflow/dist/*.whl"
       script:
-        - $TRAVIS_BUILD_DIR/tensorflow/make_py_wheel.sh RELEASE_FILES="$TRAVIS_BUILD_DIR/tensorflow/dist/*.whl"
+        - $TRAVIS_BUILD_DIR/tensorflow/make_py_wheel.sh
         - if [[ "$RELEASE_FILES" != "" ]]; then ls -l $RELEASE_FILES          ; fi
       services: docker
     - os: osx
@@ -71,6 +71,7 @@ deploy:
   on:
     branch: master
     tags: true
+    condition: "$RELEASE_FILES" != ""
 env:
   global:
     secure: J52dK8uM1haWOP5Ktz01VETiYdpyOKtnGZXcZjxEXI7RV+44/MpkSSpKFrIex1jHDodn01Tv+/otmxotaz1HOPv4DgT2gg8FbHlpvnc6+B1/dEaeCDvnd33odmARoOszP0MNFTZdlvg6zGeJwPDYFfITn1jiFBtjazu19VIbQE4D1CSKkWsMXeyH1WjTb0LEtxhYwUcFgNqDb6trArx8xlvZNrh2/j5nPgAzvmuT0JuzwcRz9swwZftKcMjaK5JooSBTydtAzgVpVMZf1q+pF0nR9VlYIY34qQLsWirBjWHGRKdkgAEEN4vEMD1BKbhkIn7TjEpWLrH3BZuJY8uXAfnxvT8KXns2fhA1EDjlP/5n2y1jXAjqCZX8o1dC2fn6qxpL1Qg1WE0n9mhOZLMpbzCpJjBumjQPPUsviggRUs4awSYv3JrYuavvXQZ9rFM634O7CLIDVmbqssVyIYMhgIqLFAWgDxTyAxt+67vUy5ONsAenMOJ6bO36pYZHWH53isCRblUD5nq6Dj6WrW9P7lQhAdhvZ+Hyt+zyVCCblDY9lAv1KetU4i9sDSNYUkQtFTPVBw8LE4JmEctuM7iC6YqeneffPzzDLsGZ70m66VT1L4MYg5h2fGbtRuQ1nPz0+k2CNibN7NegaY35d7gUosnJJF04AeOUcea4+rgQkVM=
diff --git a/appveyor.yml b/appveyor.yml
index 9b0d385..0f1d142 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,5 +1,4 @@
 version: '{branch} build {build}'
-skip_tags: true
 image: Visual Studio 2015
 platform:
   - x64