diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
index 8eb59e1..6e2e221 100644
--- a/docs/CMakeLists.txt
+++ b/docs/CMakeLists.txt
@@ -16,16 +16,13 @@ cmake_minimum_required (VERSION 2.8.7)
 
 project(cartographer_ros_docs)
 
-SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR})
 find_package(Sphinx)
-
-set(OUTPUT_DIR "${CMAKE_BINARY_DIR}/docs/html")
-
-add_custom_target(build_doc ALL
-    ${SPHINX_EXECUTABLE} -b html
-    ${CMAKE_CURRENT_SOURCE_DIR}/source
-    ${CMAKE_CURRENT_BINARY_DIR}/html
-    COMMENT "Building documentation."
-)
-
-# TODO(hrapp): Install documentation?
+if(SPHINX_FOUND)
+  set(OUTPUT_DIR "${CMAKE_BINARY_DIR}/docs/html")
+  add_custom_target(build_doc ALL
+      ${SPHINX_EXECUTABLE} -b html
+      ${CMAKE_CURRENT_SOURCE_DIR}/source
+      ${CMAKE_CURRENT_BINARY_DIR}/html
+      COMMENT "Building documentation."
+  )
+endif()
diff --git a/docs/FindSphinx.cmake b/docs/FindSphinx.cmake
deleted file mode 100644
index f956f3d..0000000
--- a/docs/FindSphinx.cmake
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2016 The Cartographer Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# TODO(hrapp): Replace through the one of ceres
-
-find_program(SPHINX_EXECUTABLE
-             NAMES sphinx-build
-             PATHS
-               /usr/bin
-             DOC "Sphinx")
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Sphinx DEFAULT_MSG SPHINX_EXECUTABLE)