diff --git a/.ci_support/linux_python3.7.yaml b/.ci_support/linux_python3.7.yaml
index ac06013..8c514bb 100644
--- a/.ci_support/linux_python3.7.yaml
+++ b/.ci_support/linux_python3.7.yaml
@@ -14,3 +14,5 @@ pin_run_as_build:
     max_pin: x.x
 python:
 - '3.7'
+
+
diff --git a/.gitattributes b/.gitattributes
index 86ff937..ac943c1 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -17,6 +17,7 @@ bld.bat text eol=crlf
 .gitattributes linguist-generated=true
 .gitignore linguist-generated=true
 .travis.yml linguist-generated=true
+.scripts linguist-generated=true
 LICENSE.txt linguist-generated=true
 README.md linguist-generated=true
 azure-pipelines.yml linguist-generated=true
diff --git a/.travis.yml b/.travis.yml
index a9034cd..2d1aae8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,13 +11,16 @@ env:
 matrix:
   include:
     - env: CONFIG=linux_ppc64le_python3.6 UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=condaforge/linux-anvil-ppc64le
-      os: linux-ppc64le
+      os: linux
+      arch: ppc64le
 
     - env: CONFIG=linux_ppc64le_python3.7 UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=condaforge/linux-anvil-ppc64le
-      os: linux-ppc64le
+      os: linux
+      arch: ppc64le
 
     - env: CONFIG=linux_ppc64le_python3.8 UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=condaforge/linux-anvil-ppc64le
-      os: linux-ppc64le
+      os: linux
+      arch: ppc64le
 
 script:
   - export CI=travis
diff --git a/README.md b/README.md
index 0f9972c..e97d2be 100644
--- a/README.md
+++ b/README.md
@@ -18,8 +18,8 @@ Current build status
 <table><tr>
     <td>Travis</td>
     <td>
-      <a href="https://travis-ci.org/conda-forge/pybind11-feedstock">
-        <img alt="macOS" src="https://img.shields.io/travis/conda-forge/pybind11-feedstock/master.svg?label=macOS">
+      <a href="https://travis-ci.com/conda-forge/pybind11-feedstock">
+        <img alt="macOS" src="https://img.shields.io/travis/com/conda-forge/pybind11-feedstock/master.svg?label=macOS">
       </a>
     </td>
   </tr><tr>
@@ -219,7 +219,7 @@ A feedstock is made up of a conda recipe (the instructions on what and how to bu
 the package) and the necessary configurations for automatic building using freely
 available continuous integration services. Thanks to the awesome service provided by
 [CircleCI](https://circleci.com/), [AppVeyor](https://www.appveyor.com/)
-and [TravisCI](https://travis-ci.org/) it is possible to build and upload installable
+and [TravisCI](https://travis-ci.com/) it is possible to build and upload installable
 packages to the [conda-forge](https://anaconda.org/conda-forge)
 [Anaconda-Cloud](https://anaconda.org/) channel for Linux, Windows and OSX respectively.
 
diff --git a/recipe/build.sh b/recipe/build.sh
index a7e3f2f..bc0cea0 100644
--- a/recipe/build.sh
+++ b/recipe/build.sh
@@ -4,7 +4,6 @@ cd build
 
 cmake \
   -DCMAKE_INSTALL_PREFIX=$PREFIX \
-  -DUSE_PYTHON_INCLUDE_DIR=ON \
   -DPYTHON_EXECUTABLE=$PREFIX/bin/python \
   -DPYBIND11_TEST=OFF \
   $SRC_DIR
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index cf71e8d..0214130 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -11,7 +11,7 @@ source:
     sha256: {{ sha256 }}
 
 build:
-    number: 0
+    number: 1
 
 requirements:
     build:
@@ -28,10 +28,12 @@ test:
     imports:
         - pybind11
     commands:
-        - test -f ${PREFIX}/share/cmake/pybind11/pybind11Config.cmake                                 # [unix]
-        - if exist %LIBRARY_PREFIX%\share\cmake\pybind11\pybind11Config.cmake (exit 0) else (exit 1)  # [win]
+        - test -f ${PREFIX}/share/cmake/pybind11/pybind11Config.cmake                                       # [unix]
+        - if exist %LIBRARY_PREFIX%\share\cmake\pybind11\pybind11Config.cmake (exit 0) else (exit 1)        # [win]
         - test $(python -c "import pybind11 as py; print(py.get_include())") == "${PREFIX}/include"         # [unix]
         - test $(python -c "import pybind11 as py; print(py.get_include())") == "%LIBRARY_PREFIX%\include"  # [win]
+        - test -f $(python -c "import pybind11 as py; print(py.get_include())")/pybind11/pybind11.h         # [unix]
+        - if exist $(python -c "import pybind11 as py; print(py.get_include())")\pybind11\pybind11.h (exit 0) else (exit 1)  # [win]
 
 about:
     home: https://github.com/pybind/pybind11/
diff --git a/recipe/remconda.patch b/recipe/remconda.patch
new file mode 100644
index 0000000..7b0c4e2
--- /dev/null
+++ b/recipe/remconda.patch
@@ -0,0 +1,31 @@
+From 592867bbb23ce0a67d5d325037bf92c20f17a60f Mon Sep 17 00:00:00 2001
+From: Henry Schreiner <henry.fredrick.schreiner@cern.ch>
+Date: Wed, 15 Jan 2020 15:39:18 -0500
+Subject: [PATCH] Fix conda include reporting
+
+---
+ pybind11/__init__.py | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/pybind11/__init__.py b/pybind11/__init__.py
+index c625e8c94..5782ffea2 100644
+--- a/pybind11/__init__.py
++++ b/pybind11/__init__.py
+@@ -10,17 +10,9 @@ def get_include(user=False):
+     virtualenv = hasattr(sys, 'real_prefix') or \
+         sys.prefix != getattr(sys, "base_prefix", sys.prefix)
+ 
+-    # Are we running in a conda environment?
+-    conda = os.path.exists(os.path.join(sys.prefix, 'conda-meta'))
+-
+     if virtualenv:
+         return os.path.join(sys.prefix, 'include', 'site',
+                             'python' + sys.version[:3])
+-    elif conda:
+-        if os.name == 'nt':
+-            return os.path.join(sys.prefix, 'Library', 'include')
+-        else:
+-            return os.path.join(sys.prefix, 'include')
+     else:
+         dist = Distribution({'name': 'pybind11'})
+         dist.parse_config_files()
\ No newline at end of file