diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c
index 9864f7884f2614a6e85e02d53fecddc6a9846455..f30a3413b22a1a1dc3807f58b504bdc185e174d5 100644
--- a/channels/chan_gtalk.c
+++ b/channels/chan_gtalk.c
@@ -36,7 +36,8 @@
 	<depend>iksemel</depend>
 	<depend>res_jabber</depend>
 	<use type="external">openssl</use>
-	<support_level>extended</support_level>
+	<support_level>deprecated</support_level>
+	<replacement>chan_motif</replacement>
  ***/
 
 #include "asterisk.h"
diff --git a/channels/chan_jingle.c b/channels/chan_jingle.c
index a3adb653a8710edae76cb9de7e9afa20a7b2d4d8..29329c6c61ea9745896189fe8f1ce7161f6e2eef 100644
--- a/channels/chan_jingle.c
+++ b/channels/chan_jingle.c
@@ -32,7 +32,8 @@
 	<depend>res_jabber</depend>
 	<use type="external">openssl</use>
 	<defaultenabled>no</defaultenabled>
-	<support_level>extended</support_level>
+	<support_level>deprecated</support_level>
+	<replacement>chan_motif</replacement>
  ***/
 
 #include "asterisk.h"
diff --git a/include/asterisk/doxygen/architecture.h b/include/asterisk/doxygen/architecture.h
index 27b8d2a5adae8c8566cff1691d5c3e91cae86bde..c157697eee0affe37c6e537d0a9ef7639ea1fef3 100644
--- a/include/asterisk/doxygen/architecture.h
+++ b/include/asterisk/doxygen/architecture.h
@@ -185,7 +185,7 @@ Some examples of modules that provide C APIs (potentially among other things) ar
  - res_ael_share.c
  - res_crypto.c
  - res_curl.c
- - res_jabber.c
+ - res_xmpp.c
  - res_monitor.c
  - res_smdi.c
  - res_speech.c
diff --git a/main/devicestate.c b/main/devicestate.c
index 779668259e81c61619dff77ac29b8ae06a2d819a..3256a7b4f9a074fcac9c6378a56af6f385590747 100644
--- a/main/devicestate.c
+++ b/main/devicestate.c
@@ -70,7 +70,7 @@
  *	The CLI command "show hints" show last known state
  *
  *	\note None of these handle user states, like an IM presence
- *	system. res_jabber.c can subscribe and watch such states
+ *	system. res_xmpp.c can subscribe and watch such states
  *	in jabber/xmpp based systems.
  *
  *	\section AstDevStateArch Architecture for devicestates
diff --git a/res/res_jabber.c b/res/res_jabber.c
index ee55df99adf775a1af8e99d93ca158dcaae18024..fde8a452b5b633823ada610e818a928459de9303 100644
--- a/res/res_jabber.c
+++ b/res/res_jabber.c
@@ -34,7 +34,8 @@
         <defaultenabled>no</defaultenabled>
 	<depend>iksemel</depend>
 	<use type="external">openssl</use>
-	<support_level>extended</support_level>
+	<support_level>deprecated</support_level>
+	<replacement>res_xmpp</replacement>
  ***/
 
 #include "asterisk.h"