diff --git a/Changelog.draft.rst b/Changelog.draft.rst
index 8b599f9..fb5c3ff 100644
--- a/Changelog.draft.rst
+++ b/Changelog.draft.rst
@@ -19,6 +19,8 @@ Changes
 Bug Fixes
 ---------
 
+* Fix documentation build.
+
 
 Pending for the next major release
 ==================================
diff --git a/Makefile b/Makefile
index 20eebab..08c1a7a 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@
 VERSION=4.0.16
 TARGZ=offlineimap_$(VERSION).tar.gz
 SHELL=/bin/bash
-RST2HTML=`type rst2html 2>/dev/null && echo rst2html || echo rst2html.py`
+RST2HTML=`type rst2html 2>/dev/null 2>&1 && echo rst2html || echo rst2html.py`
 
 all: build
 
diff --git a/docs/Makefile b/docs/Makefile
index fd1153e..fff639d 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -5,8 +5,8 @@ SOURCES = $(wildcard *.rst)
 HTML_TARGETS = $(patsubst %.rst,%.html,$(SOURCES))
 
 RM = rm
-RST2HTML=`type rst2html 2>/dev/null && echo rst2html || echo rst2html.py`
-RST2MAN=`type rst2man 2>/dev/null && echo rst2man || echo rst2man.py`
+RST2HTML=`type rst2html 2>/dev/null 2>&1 && echo rst2html || echo rst2html.py`
+RST2MAN=`type rst2man 2>/dev/null 2>&1 && echo rst2man || echo rst2man.py`
 
 all: html