diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6dc48fb..626af93 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,7 +49,7 @@ find_package(Protobuf REQUIRED)
 # Only build the documentation if we can find Sphinx.
 find_package(Sphinx)
 if(SPHINX_FOUND)
-  add_subdirectory("doc")
+  add_subdirectory("docs")
 endif()
 
 set(GMOCK_SRC_DIR "/usr/src/gmock" CACHE STRING "Path to google-mock sources.")
diff --git a/doc/CMakeLists.txt b/docs/CMakeLists.txt
similarity index 94%
rename from doc/CMakeLists.txt
rename to docs/CMakeLists.txt
index c650496..2242b4a 100644
--- a/doc/CMakeLists.txt
+++ b/docs/CMakeLists.txt
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set(OUTPUT_DIR "${CMAKE_BINARY_DIR}/doc/html")
+set(OUTPUT_DIR "${CMAKE_BINARY_DIR}/docs/html")
 
 add_custom_target(build_doc ALL
     ${SPHINX_EXECUTABLE} -b html
diff --git a/doc/source/conf.py b/docs/source/conf.py
similarity index 100%
rename from doc/source/conf.py
rename to docs/source/conf.py
diff --git a/doc/source/index.rst b/docs/source/index.rst
similarity index 100%
rename from doc/source/index.rst
rename to docs/source/index.rst