diff --git a/Doxyfile.in b/Doxyfile.in
index d61cb89a1..b79c9909d 100644
--- a/Doxyfile.in
+++ b/Doxyfile.in
@@ -528,6 +528,7 @@ WARN_LOGFILE           =
 # with spaces.
 
 INPUT                  = @SRC_DIR@/src/libstrongswan \
+                         @SRC_DIR@/src/libhydra \
                          @SRC_DIR@/src/libcharon \
                          @SRC_DIR@/src/libsimaka \
                          @SRC_DIR@/src/libfast \
diff --git a/src/libhydra/hydra.h b/src/libhydra/hydra.h
index 9726d07a6..acbaa01cc 100644
--- a/src/libhydra/hydra.h
+++ b/src/libhydra/hydra.h
@@ -16,11 +16,11 @@
 /**
  * @defgroup libhydra libhydra
  *
- */
-
-/**
- * @defgroup hydra hydra
- * @{ @ingroup libhydra
+ * @defgroup hplugins plugins
+ * @ingroup libhydra
+ *
+ * @addtogroup libhydra
+ * @{
  */
 
 #ifndef HYDRA_H_
diff --git a/src/libhydra/plugins/attr_sql/attr_sql_plugin.h b/src/libhydra/plugins/attr_sql/attr_sql_plugin.h
index 12837fffa..ba85a6b28 100644
--- a/src/libhydra/plugins/attr_sql/attr_sql_plugin.h
+++ b/src/libhydra/plugins/attr_sql/attr_sql_plugin.h
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup attr_sql attr_sql
- * @ingroup plugins
+ * @ingroup hplugins
  *
  * @defgroup sql_plugin sql_plugin
  * @{ @ingroup attr_sql