diff --git a/HTMLparser.h b/HTMLparser.h
index ca9ee146..eed7924b 100644
--- a/HTMLparser.h
+++ b/HTMLparser.h
@@ -10,6 +10,10 @@
#define __HTML_PARSER_H__
#include "parser.h"
+#ifdef __cplusplus
+#define extern "C" {
+#endif
+
/*
* Most of the back-end structures from XML and HTML are shared
*/
@@ -62,4 +66,8 @@ htmlDocPtr htmlSAXParseFile(const char *filename, const char *encoding,
htmlSAXHandlerPtr sax, void *userData);
htmlDocPtr htmlParseFile(const char *filename, const char *encoding);
+#ifdef __cplusplus
+}
+#endif
+
#endif /* __HTML_PARSER_H__ */
diff --git a/configure.in b/configure.in
index 4c50f341..53ac7a9f 100644
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ AM_CONFIG_HEADER(config.h)
LIBXML_MAJOR_VERSION=1
LIBXML_MINOR_VERSION=8
-LIBXML_MICRO_VERSION=0
+LIBXML_MICRO_VERSION=1
LIBXML_VERSION=$LIBXML_MAJOR_VERSION.$LIBXML_MINOR_VERSION.$LIBXML_MICRO_VERSION
LIBXML_VERSION_INFO=`expr $LIBXML_MAJOR_VERSION + $LIBXML_MINOR_VERSION`:$LIBXML_MICRO_VERSION:$LIBXML_MINOR_VERSION
diff --git a/debugXML.h b/debugXML.h
index b24219ae..5bec396f 100644
--- a/debugXML.h
+++ b/debugXML.h
@@ -9,6 +9,9 @@
#define __DEBUG_XML__
#include "tree.h"
+#ifdef __cplusplus
+#define extern "C" {
+#endif
extern void xmlDebugDumpString(FILE *output, const xmlChar *str);
extern void xmlDebugDumpAttr(FILE *output, xmlAttrPtr attr, int depth);
extern void xmlDebugDumpAttrList(FILE *output, xmlAttrPtr attr, int depth);
@@ -17,4 +20,7 @@ extern void xmlDebugDumpNode(FILE *output, xmlNodePtr node, int depth);
extern void xmlDebugDumpNodeList(FILE *output, xmlNodePtr node, int depth);
extern void xmlDebugDumpDocument(FILE *output, xmlDocPtr doc);
extern void xmlDebugDumpEntities(FILE *output, xmlDocPtr doc);
+#ifdef __cplusplus
+}
+#endif
#endif /* __DEBUG_XML__ */
diff --git a/doc/html/gnome-xml-entities.html b/doc/html/gnome-xml-entities.html
index 0e6e2575..119396df 100644
--- a/doc/html/gnome-xml-entities.html
+++ b/doc/html/gnome-xml-entities.html
@@ -115,7 +115,7 @@ SIZE="3"
>