diff --git a/HTMLparser.c b/HTMLparser.c
index 2260ef13..08ca2079 100644
--- a/HTMLparser.c
+++ b/HTMLparser.c
@@ -1266,6 +1266,8 @@ htmlCompareTags(const void *key, const void *member) {
  * htmlTagLookup:
  * @tag:  The tag name in lowercase
  *
+ * DEPRECATED: Only supports HTML 4.
+ *
  * Lookup the HTML tag in the ElementTable
  *
  * Returns the related htmlElemDescPtr or NULL if not found.
@@ -1583,6 +1585,8 @@ htmlStartCharData(htmlParserCtxtPtr ctxt) {
  * htmlIsScriptAttribute:
  * @name:  an attribute name
  *
+ * DEPRECATED: Only supports HTML 4.
+ *
  * Check if an attribute is of content type Script
  *
  * Returns 1 is the attribute is a script 0 otherwise
@@ -1907,6 +1911,8 @@ static const htmlEntityDesc  html40EntitiesTable[] = {
  * htmlEntityLookup:
  * @name: the entity name
  *
+ * DEPRECATED: Only supports HTML 4.
+ *
  * Lookup the given entity in EntitiesTable
  *
  * TODO: the linear scan is really ugly, an hash table is really needed.
@@ -1938,6 +1944,8 @@ htmlCompareEntityDesc(const void *vkey, const void *vdesc) {
  * htmlEntityValueLookup:
  * @value: the entity's unicode value
  *
+ * DEPRECATED: Only supports HTML 4.
+ *
  * Lookup the given entity in EntitiesTable
  *
  * TODO: the linear scan is really ugly, an hash table is really needed.
@@ -1963,6 +1971,8 @@ htmlEntityValueLookup(unsigned int value) {
  * @in:  a pointer to an array of UTF-8 chars
  * @inlen:  the length of @in
  *
+ * DEPRECATED: Internal function, don't use.
+ *
  * Take a block of UTF-8 chars in and try to convert it to an ASCII
  * plus HTML entities block of chars out.
  *
@@ -2064,6 +2074,8 @@ done:
  * @inlen:  the length of @in
  * @quoteChar: the quote character to escape (' or ") or zero.
  *
+ * DEPRECATED: Only supports HTML 4.
+ *
  * Take a block of UTF-8 chars in and try to convert it to an ASCII
  * plus HTML entities block of chars out.
  *
diff --git a/include/libxml/HTMLparser.h b/include/libxml/HTMLparser.h
index 4ac13587..00fd2b50 100644
--- a/include/libxml/HTMLparser.h
+++ b/include/libxml/HTMLparser.h
@@ -89,10 +89,13 @@ XMLPUBVAR const xmlSAXHandlerV1 htmlDefaultSAXHandler;
 XML_DEPRECATED
 XMLPUBFUN void
 			htmlInitAutoClose	(void);
+XML_DEPRECATED
 XMLPUBFUN const htmlElemDesc *
 			htmlTagLookup	(const xmlChar *tag);
+XML_DEPRECATED
 XMLPUBFUN const htmlEntityDesc *
 			htmlEntityLookup(const xmlChar *name);
+XML_DEPRECATED
 XMLPUBFUN const htmlEntityDesc *
 			htmlEntityValueLookup(unsigned int value);
 
@@ -149,16 +152,19 @@ XMLPUBFUN htmlDocPtr
 XMLPUBFUN htmlDocPtr
 			htmlParseFile	(const char *filename,
 					 const char *encoding);
+XML_DEPRECATED
 XMLPUBFUN int
 			htmlUTF8ToHtml	(unsigned char *out,
 					 int *outlen,
 					 const unsigned char *in,
 					 int *inlen);
+XML_DEPRECATED
 XMLPUBFUN int
 			htmlEncodeEntities(unsigned char *out,
 					 int *outlen,
 					 const unsigned char *in,
 					 int *inlen, int quoteChar);
+XML_DEPRECATED
 XMLPUBFUN int
 			htmlIsScriptAttribute(const xmlChar *name);
 XML_DEPRECATED
diff --git a/python/generator.py b/python/generator.py
index 0284171d..8e8a0cef 100755
--- a/python/generator.py
+++ b/python/generator.py
@@ -301,6 +301,7 @@ deprecated_funcs = {
     'htmlInitAutoClose': True,
     'htmlIsAutoClosed': True,
     'htmlIsBooleanAttr': True,
+    'htmlIsScriptAttribute': True,
     'htmlParseCharRef': True,
     'htmlParseElement': True,
     'xmlByteConsumed': True,