diff --git a/Changelog.draft.rst b/Changelog.draft.rst
index c5bd8ae..51f313d 100644
--- a/Changelog.draft.rst
+++ b/Changelog.draft.rst
@@ -33,6 +33,8 @@ Changes
 Bug Fixes
 ---------
 
+* Fix ignoring output while determining the rst2xxx command name to build
+  documentation.
 * Fix hang because of infinite loop reading EOF.
 * Allow SSL connections to send keep-alive messages.
 * Fix regression (UIBase is no more).
diff --git a/Makefile b/Makefile
index 597c49b..69532d4 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@
 VERSION=`./offlineimap.py --version`
 TARGZ=offlineimap_$(VERSION).tar.gz
 SHELL=/bin/bash
-RST2HTML=`type rst2html 2>/dev/null 2>&1 && echo rst2html || echo rst2html.py`
+RST2HTML=`type rst2html >/dev/null 2>&1 && echo rst2html || echo rst2html.py`
 
 all: build
 
diff --git a/docs/Makefile b/docs/Makefile
index fff639d..70a99a2 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 2>&1 && echo rst2html || echo rst2html.py`
-RST2MAN=`type rst2man 2>/dev/null 2>&1 && echo rst2man || echo rst2man.py`
+RST2HTML=`type rst2html >/dev/null 2>&1 && echo rst2html || echo rst2html.py`
+RST2MAN=`type rst2man >/dev/null 2>&1 && echo rst2man || echo rst2man.py`
 
 all: html