diff --git a/Documentation/Cookbook/CMakeLists.txt b/Documentation/Cookbook/CMakeLists.txt
index 38b7bdae1d391ed3970a5ef068f17cc50b91eade..c208864ee2d67d3f11c609fda0a74e207378aa00 100644
--- a/Documentation/Cookbook/CMakeLists.txt
+++ b/Documentation/Cookbook/CMakeLists.txt
@@ -111,10 +111,33 @@ add_custom_target(CookBookHTMLFromRST
   DEPENDS generate_otbapps_rst
   COMMENT "Building RST documentation in html")
 
-# add_custom_target(CookBookHTMLFromPDF
-#   ALL
-#   COMMAND ${CMAKE_MAKE_PROGRAM} pdf
-#   WORKING_DIRECTORY ${RST_GENERATED_SOURCE_DIR}
-#   COMMENT "Building RST documentation in pdf")
+find_program(TAR_COMMAND
+  NAMES tar
+  PATHS /usr/bin
+)
+mark_as_advanced(TAR_COMMAND)
+
+if(TAR_COMMAND)
+  add_custom_target(CookBookArchive
+    ALL
+    COMMAND ${TAR_COMMAND}
+      --transform "s/^html/CookBook-${OTB_VERSION_MAJOR}.${OTB_VERSION_MINOR}/"
+      -czf ${CMAKE_BINARY_DIR}/CookBook-${OTB_VERSION_MAJOR}.${OTB_VERSION_MINOR}-html.tar.gz html
+    WORKING_DIRECTORY ${RST_BUILD_DIR}
+    DEPENDS CookBookHTMLFromRST
+    COMMENT "Creating archive for html CookBook")
+endif()
 
-# add_dependencies(CookBookHTMLFromPDF CookBookHTMLFromRST)
+find_program(PDFLATEX_COMMAND
+  NAMES pdflatex
+  PATHS /usr/bin
+)
+mark_as_advanced(PDFLATEX_COMMAND)
+
+if(PDFLATEX_COMMAND)
+  add_custom_target(CookBookPDFFromRST
+    ALL
+    COMMAND ${CMAKE_MAKE_PROGRAM} latexpdf
+    WORKING_DIRECTORY ${RST_GENERATED_SOURCE_DIR}
+    COMMENT "Building RST documentation in pdf")
+endif()