diff --git a/cmake/toolchain/heptools-dev2.cmake b/cmake/toolchain/heptools-dev2.cmake
index efcd530d682702ee1ce99e045a08c1f39be0fc9b..8a8403b0291d388e53c76018a225773e8002aec5 100644
--- a/cmake/toolchain/heptools-dev2.cmake
+++ b/cmake/toolchain/heptools-dev2.cmake
@@ -127,7 +127,6 @@ if(NOT ${LCG_OS}${LCG_OSVERS} STREQUAL mac109 AND NOT LCG_TARGET MATCHES "icc" )
 endif()
 LCG_external_package(vectorclass       1.16                                     )
 LCG_external_package(vdt               0.3.6                                    )
-LCG_external_package(xapian            1.2.21                                    )
 LCG_external_package(XercesC           3.1.1p1        author=3.1.1              )
 LCG_external_package(xqilla            2.2.4p1                                  )
 LCG_external_package(xrootd            4.2.2                                    )
diff --git a/cmake/toolchain/heptools-dev3.cmake b/cmake/toolchain/heptools-dev3.cmake
index 222a191f747610939bb20e767349d4aa9ddf3e35..7607b40f2aaf97e64effde2af3791573fbe0962e 100644
--- a/cmake/toolchain/heptools-dev3.cmake
+++ b/cmake/toolchain/heptools-dev3.cmake
@@ -129,7 +129,6 @@ if(NOT ${LCG_OS}${LCG_OSVERS} STREQUAL mac109 AND NOT LCG_TARGET MATCHES "icc" )
 endif()
 LCG_external_package(vectorclass       1.16                                     )
 LCG_external_package(vdt               0.3.6                                    )
-LCG_external_package(xapian            1.2.21                                    )
 LCG_external_package(XercesC           3.1.1p1        author=3.1.1              )
 LCG_external_package(xqilla            2.2.4p1                                  )
 LCG_external_package(xrootd            4.2.2                                    )
diff --git a/cmake/toolchain/heptools-dev4.cmake b/cmake/toolchain/heptools-dev4.cmake
index f1b7f496f948d5f1a6f9c46ba92a0c8015f00e26..0c946930f50ede060ece17b30e98c5f6396dcc30 100644
--- a/cmake/toolchain/heptools-dev4.cmake
+++ b/cmake/toolchain/heptools-dev4.cmake
@@ -129,7 +129,6 @@ if(NOT ${LCG_OS}${LCG_OSVERS} STREQUAL mac109 AND NOT LCG_TARGET MATCHES "icc" )
 endif()
 LCG_external_package(vectorclass       1.16                                     )
 LCG_external_package(vdt               0.3.6                                    )
-LCG_external_package(xapian            1.2.21                                    )
 LCG_external_package(XercesC           3.1.1p1        author=3.1.1              )
 LCG_external_package(xqilla            2.2.4p1                                  )
 LCG_external_package(xrootd            4.2.2                                    )
diff --git a/cmake/toolchain/heptools-experimental.cmake b/cmake/toolchain/heptools-experimental.cmake
index aef5499382b3627391100bfbeebb922a0b221b1a..7de86dd8d22c095dcb0eb188f9a3785cbc118e94 100644
--- a/cmake/toolchain/heptools-experimental.cmake
+++ b/cmake/toolchain/heptools-experimental.cmake
@@ -40,7 +40,7 @@ LCG_external_package(cx_oracle         5.1.1
 if(NOT ${LCG_OS} STREQUAL mac)
   LCG_external_package(Davix             0.4.0                                  )
 endif()
-LCG_external_package(doxygen           1.8.9.1                                  ) 
+LCG_external_package(doxygen           1.8.9.1.p1                                  ) 
 LCG_external_package(expat             2.0.1                                    )
 LCG_external_package(eigen             3.2.4                                    )
 LCG_external_package(fastjet           3.1.1                                    )
@@ -308,4 +308,4 @@ LCG_external_package(looptools         2.8            ${MCGENPATH}/looptools)
 
 
 # Prepare the search paths according to the versions above
-LCG_prepare_paths()
\ No newline at end of file
+LCG_prepare_paths()
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index cda4abcd1e2aafa428b640300dbf894bd66bc35a..8f9810d7b673fff7ab429a183f3eb4165f903e6c 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -28,8 +28,7 @@ LCGPackage_Add(
   URL http://service-spi.web.cern.ch/service-spi/external/tarFiles/xapian-core-${xapian_native_version}.tar.gz
   CONFIGURE_COMMAND ./configure --prefix=<INSTALL_DIR>
   BUILD_COMMAND  make
-  INSTALL_COMMAND make install
-          COMMAND ${CMAKE_COMMAND} -E copy <INSTALL_DIR>/include/xapian.h <INSTALL_DIR>/include/xapian/.
+  INSTALL_COMMAND make install 
   BUILD_IN_SOURCE 1
 )
 #---png-----------------------------------------------------------------------------------------------
@@ -670,11 +669,11 @@ LCGPackage_Add(
 )
 #---doxygen----------------------------------------------------------------------------------------------
 LCGPackage_Add(
-  doxygen	
+  doxygen
   URL http://service-spi.web.cern.ch/service-spi/external/tarFiles/doxygen-${doxygen_native_version}.src.tar.gz
-  CONFIGURE_COMMAND env XAPIAN=${xapian_home} ./configure --dot ${graphviz_home}/bin/dot --with-doxysearch --prefix <INSTALL_DIR>
+  CONFIGURE_COMMAND ./configure --dot ${graphviz_home}/bin/dot --prefix <INSTALL_DIR>
   BUILD_IN_SOURCE 1
-  DEPENDS graphviz xapian
+  DEPENDS graphviz
 )
 
 #---expat------------------------------------------------------------------------------------------------