diff --git a/lib/nxml/nxml.h b/lib/nxml/nxml.h
index e567bb86..0d83c37e 100644
--- a/lib/nxml/nxml.h
+++ b/lib/nxml/nxml.h
@@ -37,6 +37,8 @@
 #define LIBNXML_MINOR_VERSION	18
 #define LIBNXML_MICRO_VERSION	1
 
+#define LIBNXML_PACKAGE "nxml"
+
 #ifdef  __cplusplus
 extern "C" {
 #endif
diff --git a/lib/nxml/nxml_dtd.c b/lib/nxml/nxml_dtd.c
index 2b14ad83..12610dbc 100644
--- a/lib/nxml/nxml_dtd.c
+++ b/lib/nxml/nxml_dtd.c
@@ -210,8 +210,7 @@ __nxml_dtd_parse_get_block (nxml_t * nxml, char **buffer, size_t * size,
 }
 
 static void
-__nxml_dtd_parse_free_element_content (__nxml_doctype_element_content_t *
-				       content)
+__nxml_dtd_parse_free_element_content (__nxml_doctype_element_content_t *content)
 {
   __nxml_doctype_element_content_t *tmp, *next;
   if (!content)
diff --git a/lib/nxml/nxml_parser.c b/lib/nxml/nxml_parser.c
index 5c9cc092..1b09f3c5 100644
--- a/lib/nxml/nxml_parser.c
+++ b/lib/nxml/nxml_parser.c
@@ -1252,7 +1252,7 @@ __nxml_parse_buffer (nxml_t * nxml, char *r_buffer, size_t r_size)
 	{
 	  if (nxml->priv.func)
 	    nxml->priv.
-	      func (PACKAGE " " VERSION
+	      func (LIBNXML_PACKAGE " "  LIBNXML_VERSION_STRING 
 		    " suports only xml 1.1 or 1.0 (line %d)\n",
 		    nxml->priv.line);