diff --git a/.travis.yml b/.travis.yml
index c46956b65f..b6c87662dd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,7 @@ compiler:
     - gcc
 
 env:
-    - CONFIG_OPTS="" DESTDIR="_install"
+    - CONFIG_OPTS="" DESTDIR="_install" CHECKDOCS="yes"
     - CONFIG_OPTS="--debug no-shared enable-crypto-mdebug enable-rc5 enable-md2"
     - CONFIG_OPTS="no-pic --strict-warnings" BUILDONLY="yes"
     - CONFIG_OPTS="no-engine no-shared --strict-warnings" BUILDONLY="yes"
@@ -110,6 +110,9 @@ script:
           cd _build;
       fi
     - $make update
+    - if [ -n "$CHECKDOCS" ]; then
+          $make doc-nits;
+      fi
     - $make
     - if [ -z "$BUILDONLY" ]; then
           if [ -n "$CROSS_COMPILE" ]; then
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 84ceb76365..eefb50a8ea 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -323,6 +323,9 @@ install_sw: all install_dev install_engines install_runtime
 
 uninstall_sw: uninstall_runtime uninstall_engines uninstall_dev
 
+doc-nits:
+	$(PERL) util/find-doc-nits.pl -n
+
 install_docs: install_man_docs install_html_docs
 
 uninstall_docs: uninstall_man_docs uninstall_html_docs