diff --git a/src/joystick12/joystick12.h b/src/joystick12/joystick12.h
index 38fad455..9c28290a 100644
--- a/src/joystick12/joystick12.h
+++ b/src/joystick12/joystick12.h
@@ -32,16 +32,23 @@ namespace upm {
 /**
  * @brief Analog Joystick library
  * @defgroup joystick libupm-joystick
+ * @ingroup generic analog ainput
  */
 
 /**
+ * @library joystick
+ * @sensor joystick
+ * @comname Analog Joystick
+ * @type ainput
+ * @man generic
+ * @con analog
+ *
  * @brief C++ API for Elecfreaks Joystick v 1.2-1.4 breakout
  *
  * This file defines the Joystick API and implemntation for X, Y
  * button could be treated as normal GPIO, this enables easier
  * interrupt support
  *
- * @ingroup joystick analog
  * @snippet joystick12-example.cxx Interesting
  */
 class Joystick12 {