diff --git a/.gitignore b/.gitignore
index ca1ab806..577a58f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@
 /ocic
 conmon/conmon
 conmon/conmon.o
+/docs/ocid.8
 vendor/src/github.com/kubernetes-incubator/cri-o
diff --git a/.travis.yml b/.travis.yml
index d701c881..14416ccd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,3 +19,4 @@ script:
   - make .gitvalidation
   - make lint
   - make integration
+  - make docs
diff --git a/Makefile b/Makefile
index f3b19d08..d10fa494 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ OCID_INSTANCE := ocid_dev
 SYSTEM_GOPATH := ${GOPATH}
 PREFIX ?= ${DESTDIR}/usr
 INSTALLDIR=${PREFIX}/bin
-GO_MD2MAN ?= /usr/bin/go-md2man
+GO_MD2MAN ?= $(shell command -v go-md2man)
 export GOPATH := ${CURDIR}/vendor
 
 default: help
@@ -69,9 +69,11 @@ binaries: ${OCID_LINK} ocid ocic conmon
 MANPAGES_MD = $(wildcard docs/*.md)
 
 docs/%.1: docs/%.1.md
+	@which go-md2man > /dev/null 2>/dev/null || (echo "ERROR: go-md2man not found. Consider 'make install.tools' target" && false)
 	$(GO_MD2MAN) -in $< -out $@.tmp && touch $@.tmp && mv $@.tmp $@
 
 docs/%.8: docs/%.8.md
+	@which go-md2man > /dev/null 2>/dev/null || (echo "ERROR: go-md2man not found. Consider 'make install.tools' target" && false)
 	$(GO_MD2MAN) -in $< -out $@.tmp && touch $@.tmp && mv $@.tmp $@
 
 docs: $(MANPAGES_MD:%.md=%)
@@ -101,7 +103,7 @@ endif
 
 .PHONY: install.tools
 
-install.tools: .install.gitvalidation .install.gometalinter
+install.tools: .install.gitvalidation .install.gometalinter .install.md2man
 
 .install.gitvalidation:
 	GOPATH=${SYSTEM_GOPATH} go get github.com/vbatts/git-validation
@@ -110,6 +112,9 @@ install.tools: .install.gitvalidation .install.gometalinter
 	GOPATH=${SYSTEM_GOPATH} go get github.com/alecthomas/gometalinter
 	GOPATH=${SYSTEM_GOPATH} gometalinter --install
 
+.install.md2man:
+	GOPATH=${SYSTEM_GOPATH} go get github.com/cpuguy83/go-md2man
+
 .PHONY: \
 	binaries \
 	conmon \