diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 5237eba..52a1841 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -4,6 +4,17 @@ Changelog
 
 This lists the most important changes for each release.
 
+
+Version 5.1.0 — Unreleased
+==========================
+
+Added
+-----
+
+* Provide compatibility with pip 21.3 and above which drops the `--build-directory` option.
+  Pip has been using a temporary directory for builds since version 1.2 so manual handling of this directory should not be necessary anymore.
+
+
 Version 5.0.1 – 2020-09-09
 ==========================
 
diff --git a/devpi_builder/wheeler.py b/devpi_builder/wheeler.py
index c532ba8..e91d48c 100644
--- a/devpi_builder/wheeler.py
+++ b/devpi_builder/wheeler.py
@@ -35,7 +35,6 @@ class Builder(object):
     def __enter__(self):
         self.scratch_dir = tempfile.mkdtemp()
         self.wheelhouse = path.join(self.scratch_dir, 'wheels')
-        self.builddir = path.join(self.scratch_dir, 'build')
         return lambda *args: self.build(*args)
 
     def __exit__(self, exc_type, exc_val, exc_tb):
@@ -78,12 +77,10 @@ def build(self, package, version):
         :param version: The version to generate the wheel for
         :return: The path of the build wheel. Valid until the context is exited.
         """
-        shutil.rmtree(self.builddir, ignore_errors=True)
         try:
             subprocess.check_output([
                 'pip', 'wheel',
                 '--wheel-dir=' + self.wheelhouse,
-                '--build=' + self.builddir,
                 '{}=={}'.format(package, version)
             ], stderr=subprocess.STDOUT)
             return self._find_wheel(package, version)