diff --git a/Makefile b/Makefile
index 8d507323..9cbb16f9 100644
--- a/Makefile
+++ b/Makefile
@@ -42,7 +42,7 @@ endif
 VERSION := $(shell grep PSYCOPG_VERSION setup.py | head -1 | sed -e "s/.*'\(.*\)'/\1/")
 SDIST := dist/psycopg2-$(VERSION).tar.gz
 
-.PHONY: env check clean
+.PHONY: check clean
 
 default: package
 
diff --git a/doc/Makefile b/doc/Makefile
index 14594e22..99435943 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,4 +1,4 @@
-.PHONY: env help clean html doctest
+.PHONY: env help clean html package doctest
 
 docs: html
 
@@ -9,18 +9,21 @@ check: doctest
 
 PYTHON := python$(PYTHON_VERSION)
 PYTHON_VERSION ?= $(shell $(PYTHON) -c 'import sys; print ("%d.%d" % sys.version_info[:2])')
+BUILD_DIR = $(shell pwd)/../build/lib.$(PYTHON_VERSION)
 
 SPHINXBUILD ?= $$(pwd)/env/bin/sphinx-build
 SPHOPTS = SPHINXBUILD=$(SPHINXBUILD)
 
-html: src/sqlstate_errors.rst
-	$(MAKE) PYTHON=$(PYTHON) -C .. package
+html: package src/sqlstate_errors.rst
 	$(MAKE) $(SPHOPTS) -C src $@
 	cp -r src/_build/html .
 
-src/sqlstate_errors.rst: ../psycopg/sqlstate_errors.h
+src/sqlstate_errors.rst: ../psycopg/sqlstate_errors.h $(BUILD_DIR)
 	env/bin/python src/tools/make_sqlstate_docs.py $< > $@
 
+$(BUILD_DIR):
+	$(MAKE) PYTHON=$(PYTHON) -C .. package
+
 doctest:
 	$(MAKE) PYTHON=$(PYTHON) -C .. package
 	$(MAKE) $(SPHOPTS) -C src $@