diff --git a/Makefile b/Makefile
index 5dcfd36..5a1111c 100755
--- a/Makefile
+++ b/Makefile
@@ -13,11 +13,13 @@ clean: ## delete generated byte code and coverage reports
 upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade
 upgrade: ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in
 	pip install -q -r requirements/pip_tools.txt
+	pip-compile --upgrade --allow-unsafe --rebuild -o requirements/pip.txt requirements/pip.in
 	pip-compile --upgrade -o requirements/pip_tools.txt requirements/pip_tools.in
 	pip-compile --upgrade -o requirements/base.txt requirements/base.in
 	pip-compile --upgrade -o requirements/test.txt requirements/test.in
 
 requirements: ## install development environment requirements
+	pip install -qr requirements/pip.txt
 	pip install -q -r requirements/pip_tools.txt
 	pip install -qr requirements/base.txt --exists-action w
 	pip-sync requirements/base.txt requirements/constraints.txt requirements/test.txt
diff --git a/requirements/pip.in b/requirements/pip.in
new file mode 100644
index 0000000..21ce8e9
--- /dev/null
+++ b/requirements/pip.in
@@ -0,0 +1,5 @@
+# Core dependencies for installing other packages
+
+pip
+setuptools
+wheel
diff --git a/requirements/pip.txt b/requirements/pip.txt
new file mode 100644
index 0000000..080a9e6
--- /dev/null
+++ b/requirements/pip.txt
@@ -0,0 +1,14 @@
+#
+# This file is autogenerated by pip-compile
+# To update, run:
+#
+#    make upgrade
+#
+wheel==0.36.2
+    # via -r requirements/pip.in
+
+# The following packages are considered to be unsafe in a requirements file:
+pip==21.1
+    # via -r requirements/pip.in
+setuptools==56.0.0
+    # via -r requirements/pip.in
diff --git a/requirements/test.txt b/requirements/test.txt
index 30b28cb..19256d2 100644
--- a/requirements/test.txt
+++ b/requirements/test.txt
@@ -43,7 +43,7 @@ mccabe==0.6.1
     # via pylint
 packaging==20.9
     # via pytest
-pbr==5.5.1
+pbr==5.6.0
     # via stevedore
 pluggy==0.13.1
     # via pytest
@@ -57,7 +57,7 @@ pylint-plugin-utils==0.6
     # via
     #   pylint-celery
     #   pylint-django
-pylint==2.8.1
+pylint==2.8.2
     # via
     #   edx-lint
     #   pylint-celery
diff --git a/setup.py b/setup.py
index 21081d9..e49d730 100644
--- a/setup.py
+++ b/setup.py
@@ -44,7 +44,7 @@ def is_requirement(line):
 
 setup(
     name='acid-xblock',
-    version='0.2',
+    version='0.2.1',
     description='Acid XBlock Test',
     long_description=README,
     long_description_content_type='text/markdown',