diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 51fd476..939b3af 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1 @@
-* @isuruf @jakirkham @jezdez @mbargull @ocefpaf
\ No newline at end of file
+* @dbast @isuruf @jakirkham @jezdez @kenodegard @mbargull @ocefpaf
\ No newline at end of file
diff --git a/README.md b/README.md
index 17e7727..bc70e3a 100644
--- a/README.md
+++ b/README.md
@@ -400,9 +400,11 @@ In order to produce a uniquely identifiable distribution:
 Feedstock Maintainers
 =====================
 
+* [@dbast](https://github.com/dbast/)
 * [@isuruf](https://github.com/isuruf/)
 * [@jakirkham](https://github.com/jakirkham/)
 * [@jezdez](https://github.com/jezdez/)
+* [@kenodegard](https://github.com/kenodegard/)
 * [@mbargull](https://github.com/mbargull/)
 * [@ocefpaf](https://github.com/ocefpaf/)
 
diff --git a/recipe/build.sh b/recipe/build.sh
index 2abfa25..ad97792 100755
--- a/recipe/build.sh
+++ b/recipe/build.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+cd conda-src/
+
 if [[ "$build_platform" != "$target_platform" && -z "$PYTHONPATH" ]]; then
     # conda-build special cases conda and doesn't activate it
     # See https://github.com/conda/conda-build/blob/1010e8309a20e144c51b1d86b2daebd146be923e/conda_build/metadata.py#L2273
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index 79e132d..bc09fc8 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -14,11 +14,12 @@ source:
   fn: conda-{{ version }}.tar.gz
   url: https://github.com/conda/{{ name }}/archive/{{ version }}.tar.gz
   sha256: {{ sha256 }}
+  folder: conda-src  # avoid bootstrapping issues
   patches:
     - patches/01-deprecations-version-fallback.patch
 
 build:
-  number: 0
+  number: 1
   # These are present when the new environment is created
   # so we have to exempt them from the list of initial files
   # for conda-build to realize they should be included.
@@ -73,8 +74,8 @@ requirements:
 test:
 {% if run_pytest == 'yes' %}
   source_files:
-    - tests
-    - setup.cfg
+    - conda-src/tests
+    - conda-src/setup.cfg
 {% endif %}
   requires:
     - mock
@@ -103,7 +104,7 @@ test:
 about:
   home: https://conda.io
   license: BSD-3-Clause
-  license_file: LICENSE.txt
+  license_file: conda-src/LICENSE.txt
   summary: OS-agnostic, system-level binary package and environment manager.
   description: >
     Conda is an open source package management system and environment management system for installing multiple versions of software packages and their dependencies and switching easily between them. It works on Linux, OS X and Windows, and was created for Python programs but can package and distribute any software.