diff --git a/src/iq.rs b/src/iq.rs
index aed6a83e39d12a1dbc15f923d055be5b861b6d17..aab1efcbd09145df9823383e989134d23f86b6ad 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 35dacabd7cf1c705514a6ce56cf46383b2d6ba58..359ba7b0c940dc13d64d762f4f9b1ffbe84f3219 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 bbb6a5e075cfa35698619440563a52dea65072a7..ea56042501228f54ceec2913c68d909c464415ff 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 098c401ad94a478479e480586aa0194ca36c1c05..fe970e3b28a7fda338465a4324855b8496706cf6 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>,