diff --git a/src/iq.rs b/src/iq.rs
index aed6a83e..aab1efcb 100644
--- a/src/iq.rs
+++ b/src/iq.rs
@@ -190,6 +190,7 @@ impl<'a> IntoAttributeValue for &'a IqType {
     }
 }
 
+/// The main structure representing the `<iq/>` stanza.
 #[derive(Debug, Clone)]
 pub struct Iq {
     pub from: Option<Jid>,
diff --git a/src/lib.rs b/src/lib.rs
index 35dacabd..359ba7b0 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -58,7 +58,11 @@ macro_rules! generate_attribute {
     ($elem:ident, $name:tt, {$($a:ident => $b:tt),+}) => (
         #[derive(Debug, Clone, PartialEq)]
         pub enum $elem {
-            $($a),+
+            $(
+                #[doc=$b]
+                #[doc="value for this attribute."]
+                $a
+            ),+
         }
         impl FromStr for $elem {
             type Err = Error;
@@ -80,7 +84,11 @@ macro_rules! generate_attribute {
     ($elem:ident, $name:tt, {$($a:ident => $b:tt),+}, Default = $default:ident) => (
         #[derive(Debug, Clone, PartialEq)]
         pub enum $elem {
-            $($a),+
+            $(
+                #[doc=$b]
+                #[doc="value for this attribute."]
+                $a
+            ),+
         }
         impl FromStr for $elem {
             type Err = Error;
diff --git a/src/message.rs b/src/message.rs
index bbb6a5e0..ea560425 100644
--- a/src/message.rs
+++ b/src/message.rs
@@ -115,6 +115,7 @@ type Body = String;
 type Subject = String;
 type Thread = String;
 
+/// The main structure representing the `<message/>` stanza.
 #[derive(Debug, Clone)]
 pub struct Message {
     pub from: Option<Jid>,
diff --git a/src/presence.rs b/src/presence.rs
index 098c401a..fe970e3b 100644
--- a/src/presence.rs
+++ b/src/presence.rs
@@ -186,6 +186,7 @@ impl IntoAttributeValue for Type {
     }
 }
 
+/// The main structure representing the `<presence/>` stanza.
 #[derive(Debug, Clone)]
 pub struct Presence {
     pub from: Option<Jid>,