diff --git a/encoding.c b/encoding.c
index a90694f5..c4271996 100644
--- a/encoding.c
+++ b/encoding.c
@@ -319,7 +319,7 @@ xmlDetectCharEncoding(const unsigned char* in, int len)
  * xmlCleanupEncodingAliases:
  *
  * DEPRECATED: This function modifies global state and is not
- * thread-safe.
+ * thread-safe. See xmlCtxtSetCharEncConvImpl for an alternative.
  *
  * Unregisters all aliases
  */
@@ -386,7 +386,7 @@ xmlGetEncodingAlias(const char *alias) {
  * @alias:  the alias name as parsed, in UTF-8 format (ASCII actually)
  *
  * DEPRECATED: This function modifies global state and is not
- * thread-safe.
+ * thread-safe. See xmlCtxtSetCharEncConvImpl for an alternative.
  *
  * Registers an alias @alias for an encoding named @name. Existing alias
  * will be overwritten.
@@ -461,7 +461,7 @@ xmlAddEncodingAlias(const char *name, const char *alias) {
  * @alias:  the alias name as parsed, in UTF-8 format (ASCII actually)
  *
  * DEPRECATED: This function modifies global state and is not
- * thread-safe.
+ * thread-safe. See xmlCtxtSetCharEncConvImpl for an alternative.
  *
  * Unregisters an encoding alias @alias
  *
@@ -584,7 +584,7 @@ xmlGetCharEncodingName(xmlCharEncoding enc) {
  * @output:  the xmlCharEncodingOutputFunc to write that encoding
  *
  * DEPRECATED: This function modifies global state and is not
- * thread-safe.
+ * thread-safe. See xmlCtxtSetCharEncConvImpl for an alternative.
  *
  * Create and registers an xmlCharEncodingHandler.
  *
@@ -763,7 +763,7 @@ xmlCleanupCharEncodingHandlers(void) {
  * @handler:  the xmlCharEncodingHandlerPtr handler block
  *
  * DEPRECATED: This function modifies global state and is not
- * thread-safe.
+ * thread-safe. See xmlCtxtSetCharEncConvImpl for an alternative.
  *
  * Register the char encoding handler.
  */
diff --git a/include/libxml/encoding.h b/include/libxml/encoding.h
index 9a358dbb..6b353a55 100644
--- a/include/libxml/encoding.h
+++ b/include/libxml/encoding.h
@@ -209,6 +209,7 @@ XMLPUBFUN void
 XML_DEPRECATED
 XMLPUBFUN void
 	xmlCleanupCharEncodingHandlers	(void);
+XML_DEPRECATED
 XMLPUBFUN void
 	xmlRegisterCharEncodingHandler	(xmlCharEncodingHandlerPtr handler);
 XMLPUBFUN xmlParserErrors
@@ -228,6 +229,7 @@ XMLPUBFUN xmlCharEncodingHandlerPtr
 	xmlGetCharEncodingHandler	(xmlCharEncoding enc);
 XMLPUBFUN xmlCharEncodingHandlerPtr
 	xmlFindCharEncodingHandler	(const char *name);
+XML_DEPRECATED
 XMLPUBFUN xmlCharEncodingHandlerPtr
 	xmlNewCharEncodingHandler	(const char *name,
 					 xmlCharEncodingInputFunc input,
@@ -244,13 +246,17 @@ XMLPUBFUN xmlParserErrors
 /*
  * Interfaces for encoding names and aliases.
  */
+XML_DEPRECATED
 XMLPUBFUN int
 	xmlAddEncodingAlias		(const char *name,
 					 const char *alias);
+XML_DEPRECATED
 XMLPUBFUN int
 	xmlDelEncodingAlias		(const char *alias);
+XML_DEPRECATED
 XMLPUBFUN const char *
 	xmlGetEncodingAlias		(const char *alias);
+XML_DEPRECATED
 XMLPUBFUN void
 	xmlCleanupEncodingAliases	(void);
 XMLPUBFUN xmlCharEncoding
diff --git a/python/generator.py b/python/generator.py
index 8e8a0cef..0647e67a 100755
--- a/python/generator.py
+++ b/python/generator.py
@@ -304,18 +304,22 @@ deprecated_funcs = {
     'htmlIsScriptAttribute': True,
     'htmlParseCharRef': True,
     'htmlParseElement': True,
+    'xmlAddEncodingAlias': True,
     'xmlByteConsumed': True,
     'xmlCheckFilename': True,
     'xmlCheckLanguageID': True,
     'xmlCleanupCharEncodingHandlers': True,
+    'xmlCleanupEncodingAliases': True,
     'xmlCleanupGlobals': True,
     'xmlCopyChar': True,
     'xmlCopyCharMultiByte': True,
     'xmlCreateEntityParserCtxt': True,
     'xmlDefaultSAXHandlerInit': True,
+    'xmlDelEncodingAlias': True,
     'xmlDictCleanup': True,
     'xmlFileMatch': True,
     'xmlGetCompressMode': True,
+    'xmlGetEncodingAlias': True,
     'xmlInitCharEncodingHandlers': True,
     'xmlInitGlobals': True,
     'xmlInitializeDict': True,