diff --git a/CMakeLists.txt b/CMakeLists.txt
index f6ce4334c..e081c762c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -83,7 +83,6 @@ OPTION ( BUILD_DOCS
    "Build documentation using Doxygen."
    OFF
 )
-add_subdirectory(doc)
 
 IF(MSVC)
   set (CMAKE_PREFIX_PATH "D:\\libs\\devil")
@@ -159,17 +158,17 @@ SET(LIBASSIMP-DEV_COMPONENT "libassimp${ASSIMP_VERSION_MAJOR}.${ASSIMP_VERSION_M
 SET(CPACK_COMPONENTS_ALL assimp-bin ${LIBASSIMP_COMPONENT} ${LIBASSIMP-DEV_COMPONENT} assimp-dev)
 SET(ASSIMP_LIBRARY_SUFFIX "" CACHE STRING "Suffix to append to library names")
 
-# Ensure that we do not run into issues like http://www.tcm.phy.cam.ac.uk/sw/inodes64.html on 32 bit linux
 IF( UNIX )
+  # Ensure that we do not run into issues like http://www.tcm.phy.cam.ac.uk/sw/inodes64.html on 32 bit linux
   IF ( CMAKE_SIZEOF_VOID_P EQUAL 4) # only necessary for 32-bit linux
     ADD_DEFINITIONS(-D_FILE_OFFSET_BITS=64 )
   ENDIF()
-ENDIF()
 
-IF( UNIX )
-    include(GNUInstallDirs)
+  # Use GNUInstallDirs for Unix predefined directories
+  include(GNUInstallDirs)
 ENDIF( UNIX )
 
+
 IF((CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) AND NOT CMAKE_COMPILER_IS_MINGW)
   IF (BUILD_SHARED_LIBS AND CMAKE_SIZEOF_VOID_P EQUAL 8) # -fPIC is only required for shared libs on 64 bit
      SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
@@ -240,6 +239,10 @@ IF( CMAKE_COMPILER_IS_GNUCXX )
   SET(LIBSTDC++_LIBRARIES -lstdc++)
 ENDIF( CMAKE_COMPILER_IS_GNUCXX )
 
+IF( BUILD_DOCS )
+    add_subdirectory(doc)
+ENDIF( BUILD_DOCS )
+
 # Search for external dependencies, and build them from source if not found
 # Search for zlib
 IF ( NOT ASSIMP_BUILD_ZLIB )
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 0ad04cf33..f7ce7b726 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,9 +1,4 @@
-# Only test for Doxygent if BUILD_DOCS are ON
-# We will configure Doxygen output anyway in case
-# of manual generation
-if( BUILD_DOCS )
-    find_package( Doxygen REQUIRED )
-endif( BUILD_DOCS )
+find_package( Doxygen REQUIRED )
 
 set( HTML_OUTPUT "AssimpDoc_Html" CACHE STRING "Output directory for generated HTML documentation. Defaults to AssimpDoc_Html." )
 
@@ -19,7 +14,7 @@ configure_file(
     @ONLY
 )
 
-add_custom_target( 
+add_custom_target(
     docs ALL
     DEPENDS docs.done
 )
@@ -35,13 +30,13 @@ add_custom_command(
 if( DEFINED CMAKE_INSTALL_DOCDIR )
     install(
         DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${HTML_OUTPUT}
-        DESTINATION ${CMAKE_INSTALL_DOCDIR}/assimp-${PROJECT_VERSION}
+        DESTINATION ${CMAKE_INSTALL_DOCDIR}
     )
     install(FILES
         ${CMAKE_CURRENT_SOURCE_DIR}/AssimpDoc_Html/AnimationOverview.png
         ${CMAKE_CURRENT_SOURCE_DIR}/AssimpDoc_Html/AnimationOverview.svg
         ${CMAKE_CURRENT_SOURCE_DIR}/AssimpDoc_Html/dragonsplash.png
-        DESTINATION ${CMAKE_INSTALL_DOCDIR}/assimp-${PROJECT_VERSION}
+        DESTINATION ${CMAKE_INSTALL_DOCDIR}/${HTML_OUTPUT}
     )
 endif( DEFINED CMAKE_INSTALL_DOCDIR )