diff --git a/protocols/Jamfile b/protocols/Jamfile
index 300903d..40560ff 100644
--- a/protocols/Jamfile
+++ b/protocols/Jamfile
@@ -1,4 +1,4 @@
 SubDir TOP protocols ;
 
 # Include all the components.
-SubInclude TOP protocols jabber ;
+SubInclude TOP protocols xmpp ;
diff --git a/protocols/jabber/FacebookMain.cpp b/protocols/xmpp/FacebookMain.cpp
similarity index 100%
rename from protocols/jabber/FacebookMain.cpp
rename to protocols/xmpp/FacebookMain.cpp
diff --git a/protocols/jabber/FacebookProtocol.cpp b/protocols/xmpp/FacebookProtocol.cpp
similarity index 100%
rename from protocols/jabber/FacebookProtocol.cpp
rename to protocols/xmpp/FacebookProtocol.cpp
diff --git a/protocols/jabber/FacebookProtocol.h b/protocols/xmpp/FacebookProtocol.h
similarity index 100%
rename from protocols/jabber/FacebookProtocol.h
rename to protocols/xmpp/FacebookProtocol.h
diff --git a/protocols/jabber/GoogleTalkMain.cpp b/protocols/xmpp/GoogleTalkMain.cpp
similarity index 100%
rename from protocols/jabber/GoogleTalkMain.cpp
rename to protocols/xmpp/GoogleTalkMain.cpp
diff --git a/protocols/jabber/GoogleTalkProtocol.cpp b/protocols/xmpp/GoogleTalkProtocol.cpp
similarity index 100%
rename from protocols/jabber/GoogleTalkProtocol.cpp
rename to protocols/xmpp/GoogleTalkProtocol.cpp
diff --git a/protocols/jabber/GoogleTalkProtocol.h b/protocols/xmpp/GoogleTalkProtocol.h
similarity index 100%
rename from protocols/jabber/GoogleTalkProtocol.h
rename to protocols/xmpp/GoogleTalkProtocol.h
diff --git a/protocols/jabber/JabberHandler.cpp b/protocols/xmpp/JabberHandler.cpp
similarity index 100%
rename from protocols/jabber/JabberHandler.cpp
rename to protocols/xmpp/JabberHandler.cpp
diff --git a/protocols/jabber/JabberHandler.h b/protocols/xmpp/JabberHandler.h
similarity index 100%
rename from protocols/jabber/JabberHandler.h
rename to protocols/xmpp/JabberHandler.h
diff --git a/protocols/jabber/JabberMain.cpp b/protocols/xmpp/JabberMain.cpp
similarity index 100%
rename from protocols/jabber/JabberMain.cpp
rename to protocols/xmpp/JabberMain.cpp
diff --git a/protocols/jabber/JabberProtocol.cpp b/protocols/xmpp/JabberProtocol.cpp
similarity index 100%
rename from protocols/jabber/JabberProtocol.cpp
rename to protocols/xmpp/JabberProtocol.cpp
diff --git a/protocols/jabber/JabberProtocol.h b/protocols/xmpp/JabberProtocol.h
similarity index 100%
rename from protocols/jabber/JabberProtocol.h
rename to protocols/xmpp/JabberProtocol.h
diff --git a/protocols/jabber/Jamfile b/protocols/xmpp/Jamfile
similarity index 97%
rename from protocols/jabber/Jamfile
rename to protocols/xmpp/Jamfile
index 2bae30f..abc0e2c 100644
--- a/protocols/jabber/Jamfile
+++ b/protocols/xmpp/Jamfile
@@ -1,4 +1,4 @@
-SubDir TOP protocols jabber ;
+SubDir TOP protocols xmpp ;
 
 SubDirSysHdrs [ FDirName $(TOP) ] ;
 SubDirSysHdrs [ FDirName $(TOP) libs ] ;
diff --git a/protocols/jabber/facebook.rdef b/protocols/xmpp/facebook.rdef
similarity index 100%
rename from protocols/jabber/facebook.rdef
rename to protocols/xmpp/facebook.rdef
diff --git a/protocols/jabber/facebook_settings.rdef b/protocols/xmpp/facebook_settings.rdef
similarity index 100%
rename from protocols/jabber/facebook_settings.rdef
rename to protocols/xmpp/facebook_settings.rdef
diff --git a/protocols/jabber/gtalk.rdef b/protocols/xmpp/gtalk.rdef
similarity index 100%
rename from protocols/jabber/gtalk.rdef
rename to protocols/xmpp/gtalk.rdef
diff --git a/protocols/jabber/gtalk_settings.rdef b/protocols/xmpp/gtalk_settings.rdef
similarity index 100%
rename from protocols/jabber/gtalk_settings.rdef
rename to protocols/xmpp/gtalk_settings.rdef
diff --git a/protocols/jabber/jabber.rdef b/protocols/xmpp/jabber.rdef
similarity index 100%
rename from protocols/jabber/jabber.rdef
rename to protocols/xmpp/jabber.rdef
diff --git a/protocols/jabber/jabber_settings.rdef b/protocols/xmpp/jabber_settings.rdef
similarity index 100%
rename from protocols/jabber/jabber_settings.rdef
rename to protocols/xmpp/jabber_settings.rdef