diff --git a/CMakeLists.txt b/CMakeLists.txt
index e79203690..35e0ecd4e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -297,7 +297,7 @@ SET(EXECUTABLE_OUTPUT_PATH ${OUTPUT_BINDIR})
 SET(OUTPUT_LIBDIR ${PROJECT_BINARY_DIR}/lib)
 MAKE_DIRECTORY(${OUTPUT_LIBDIR})
 IF(NOT MSVC)
-	MAKE_DIRECTORY(${OUTPUT_LIBDIR}/${OSG_PLUGINS})	
+    MAKE_DIRECTORY(${OUTPUT_LIBDIR}/${OSG_PLUGINS})    
 ENDIF(NOT MSVC)
 SET(LIBRARY_OUTPUT_PATH ${OUTPUT_LIBDIR})
 
@@ -444,21 +444,36 @@ IF(APPLE)
 ENDIF(APPLE)
 
 
-OPTION(BUILD_REFERENCE_DOCS "Build OpenSceneGraph reference documentation using doxygen (use: make DoxygenDoc)" OFF)
+OPTION(BUILD_REF_DOCS "Build OpenSceneGraph reference documentation using doxygen (use: make DoxygenDoc)" OFF)
 
-IF(BUILD_REFERENCE_DOCS)
+IF(BUILD_REF_DOCS)
     SET(BUILD_DOCUMENTATION YES)
-ENDIF(BUILD_REFERENCE_DOCS)
+    OPTION(BUILD_REF_DOCS_SEARCHENGINE "Enable doxygen's search engine (requires that documentation to be installed on a php enabled web server)" OFF)
+    OPTION(BUILD_REF_DOCS_TAGFILE "Generate a tag file named osg.tag on the documentation web server" OFF)
+ENDIF(BUILD_REF_DOCS)
 
 # For Doxygen
 #FIXME: I haven't figured out what to do with OSG's multiple doxyfiles 
 # and footer.
 INCLUDE(${CMAKE_ROOT}/Modules/Documentation.cmake OPTIONAL)
-
+OPTION(BUILD_DOCUMENTATION "Build osg documentation" OFF)
 # To build the documention, you will have to enable it
 # and then do the equivalent of "make DoxygenDoc".
 IF(BUILD_DOCUMENTATION)
     SET(BUILD_DOCUMENTATION YES)
+
+    IF(BUILD_REF_DOCS)
+        SET(SEARCHENGINE YES)
+    ELSE(BUILD_REF_DOCS)
+        SET(SEARCHENGINE NO)
+    ENDIF(BUILD_REF_DOCS)
+    
+    IF(BUILD_REF_DOCS_TAGFILE)
+        SET(GENERATE_TAGFILE "doc/OpenSceneGraphReferenceDocs/osg.tag")
+    ELSE(BUILD_REF_DOCS_TAGFILE)
+        SET(GENERATE_TAGFILE "")
+    ENDIF(BUILD_REF_DOCS_TAGFILE)
+    
     IF(DOT)
         SET(HAVE_DOT YES)
     ELSE(DOT)
diff --git a/doc/Doxyfiles/doxyfile.cmake b/doc/Doxyfiles/doxyfile.cmake
index bbab780f4..c1c254e65 100644
--- a/doc/Doxyfiles/doxyfile.cmake
+++ b/doc/Doxyfiles/doxyfile.cmake
@@ -969,7 +969,7 @@ TAGFILES               =
 # When a file name is specified after GENERATE_TAGFILE, doxygen will create 
 # a tag file that is based on the input files it reads.
 
-GENERATE_TAGFILE       = 
+GENERATE_TAGFILE       = ${GENERATE_TAGFILE}
 
 # If the ALLEXTERNALS tag is set to YES all external classes will be listed 
 # in the class index. If set to NO only the inherited external classes 
@@ -1128,4 +1128,5 @@ DOT_CLEANUP            = YES
 # The SEARCHENGINE tag specifies whether or not a search engine should be 
 # used. If set to NO the values of all tags below this one will be ignored.
 
-SEARCHENGINE           = NO
+SEARCHENGINE           = ${SEARCHENGINE}
+