diff --git a/setup.py b/setup.py
index 712951c5..d9041af5 100755
--- a/setup.py
+++ b/setup.py
@@ -86,6 +86,8 @@ packages     = [ 'sleekxmpp',
                  'sleekxmpp/plugins/xep_0086',
                  'sleekxmpp/plugins/xep_0091',
                  'sleekxmpp/plugins/xep_0092',
+		 'sleekxmpp/plugins/xep_0095',
+		 'sleekxmpp/plugins/xep_0096',
                  'sleekxmpp/plugins/xep_0107',
                  'sleekxmpp/plugins/xep_0108',
                  'sleekxmpp/plugins/xep_0115',
diff --git a/sleekxmpp/plugins/xep_0084/avatar.py b/sleekxmpp/plugins/xep_0084/avatar.py
index 2454afc7..677a888d 100644
--- a/sleekxmpp/plugins/xep_0084/avatar.py
+++ b/sleekxmpp/plugins/xep_0084/avatar.py
@@ -82,6 +82,7 @@ class XEP_0084(BasePlugin):
                 metadata.add_pointer(pointer)
 
         return self.xmpp['xep_0163'].publish(metadata,
+                id=info['id'],
                 ifrom=ifrom,
                 block=block,
                 callback=callback,