diff --git a/hatponboard-lib/Makefile b/hatponboard-lib/Makefile
index 10598498d5db5dea43f64e016a01e81c1657a9c3..1df32e23bc917af8c7f989641ac62f178d3de814 100644
--- a/hatponboard-lib/Makefile
+++ b/hatponboard-lib/Makefile
@@ -4,7 +4,7 @@
 
 DISTNAME=		hatponboard-lib-${VERSION}
 VERSION=		2.1.4
-PKGREVISION=		
+PKGREVISION=		1
 CATEGORIES=		planning
 MASTER_SITES=		${MASTER_SITE_OPENROBOTS:=hatponboard-lib/}
 MASTER_REPOSITORY=	${MASTER_REPOSITORY_OPENROBOTS}hatp/hatponboard-lib
@@ -19,6 +19,13 @@ MAKE_JOBS_SAFE=		yes
 DEPEND_ABI.boost-libs=boost-libs>=1.34
 DEPEND_ABI.boost-headers=boost-headers>=1.34
 
+PKG_SUPPORTED_OPTIONS+=	doc
+PKG_OPTION_DESCR.doc= Enable the documentation generation
+
+define PKG_OPTION_SET.doc
+	include ../../mk/sysdep/doxygen.mk
+endef
+
 # Find Antlr binary name and pass it to CMake 
 CMAKE_ARGS+= -DAntlr_INCLUDE=${ANTLR_INCLUDE} -DAntlr_BIN=${ANTLR_BIN} -DAntlr_LIB=${ANTLR_LIB}
 
@@ -26,7 +33,6 @@ include ../../devel/boost-headers/depend.mk
 include ../../devel/boost-libs/depend.mk
 include ../../wip/antlr2/depend.mk
 include ../../mk/sysdep/cmake.mk
-include ../../mk/sysdep/doxygen.mk
 include ../../mk/language/c.mk
 include ../../mk/language/c++.mk
 include ../../mk/robotpkg.mk
diff --git a/hatponboard-lib/patches/patch-aa b/hatponboard-lib/patches/patch-aa
new file mode 100644
index 0000000000000000000000000000000000000000..c173b24106f7883e81387e8adabfb0d38dc8898f
--- /dev/null
+++ b/hatponboard-lib/patches/patch-aa
@@ -0,0 +1,13 @@
+diff --git CMakeLists.txt CMakeLists.txt
+index 0107cfe..9024d3f 100644
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -61,7 +61,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/share/uninstall.cmake.in ${CMAKE_BINA
+ add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -P ${CMAKE_BINARY_DIR}/uninstall.cmake)
+ 
+ #Documentation
+-find_package(Doxygen REQUIRED)
++find_package(Doxygen)
+ if(DOXYGEN_FOUND)
+     configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
+     add_custom_target(doc ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Generating API documentation with Doxygen" VERBATIM)