7 files changed, 8 insertions, 9 deletions
diff --git a/src/libcharon/Makefile.am b/src/libcharon/Makefile.am
index 9ed1ffe11..14d3c39bb 100644
--- a/src/libcharon/Makefile.am
+++ b/src/libcharon/Makefile.am
@@ -245,14 +245,6 @@ if MONOLITHIC
 endif
 endif
 
-if USE_ATTR
-  SUBDIRS += plugins/attr
-  PLUGINS += attr
-if MONOLITHIC
-  libcharon_la_LIBADD += plugins/attr/libstrongswan-attr.la
-endif
-endif
-
 if USE_EAP_IDENTITY
   SUBDIRS += plugins/eap_identity
   PLUGINS += eap-identity
diff --git a/src/libhydra/Makefile.am b/src/libhydra/Makefile.am
index c669b4e11..cbf07c70d 100644
--- a/src/libhydra/Makefile.am
+++ b/src/libhydra/Makefile.am
@@ -26,6 +26,13 @@ else
 SUBDIRS = .
 endif
 
+if USE_ATTR
+  SUBDIRS += plugins/attr
+if MONOLITHIC
+  libhydra_la_LIBADD += plugins/attr/libstrongswan-attr.la
+endif
+endif
+
 if USE_ATTR_SQL
   SUBDIRS += plugins/attr_sql
 if MONOLITHIC
diff --git a/src/libcharon/plugins/attr/Makefile.am b/src/libhydra/plugins/attr/Makefile.am
index 71401648e..71401648e 100644
--- a/src/libcharon/plugins/attr/Makefile.am
+++ b/src/libhydra/plugins/attr/Makefile.am
diff --git a/src/libcharon/plugins/attr/attr_plugin.c b/src/libhydra/plugins/attr/attr_plugin.c
index 24c00bb44..24c00bb44 100644
--- a/src/libcharon/plugins/attr/attr_plugin.c
+++ b/src/libhydra/plugins/attr/attr_plugin.c
diff --git a/src/libcharon/plugins/attr/attr_plugin.h b/src/libhydra/plugins/attr/attr_plugin.h
index 0c6eebfa7..29fb33839 100644
--- a/src/libcharon/plugins/attr/attr_plugin.h
+++ b/src/libhydra/plugins/attr/attr_plugin.h
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup attr attr
- * @ingroup cplugins
+ * @ingroup hplugins
  *
  * @defgroup attr_plugin attr_plugin
  * @{ @ingroup attr
diff --git a/src/libcharon/plugins/attr/attr_provider.c b/src/libhydra/plugins/attr/attr_provider.c
index 548896f56..548896f56 100644
--- a/src/libcharon/plugins/attr/attr_provider.c
+++ b/src/libhydra/plugins/attr/attr_provider.c
diff --git a/src/libcharon/plugins/attr/attr_provider.h b/src/libhydra/plugins/attr/attr_provider.h
index a41466718..a41466718 100644
--- a/src/libcharon/plugins/attr/attr_provider.h
+++ b/src/libhydra/plugins/attr/attr_provider.h