diff --git a/ChangeLog b/ChangeLog
index 7cefe544..197a51e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Mar 20 22:25:18 HKT 2004 William Brack <wbrack@mmm.com.hk>
+
+	* xmlregexp.c: enhanced the logic of parsing char groups to
+	  better handle initial or ending '-' (bug 135972)
+
 Sat Mar 20 19:26:03 HKT 2004 William Brack <wbrack@mmm.com.hk>
 
 	* relaxng.c: added check for external reference in 
diff --git a/xmlregexp.c b/xmlregexp.c
index 1706c740..057458b2 100644
--- a/xmlregexp.c
+++ b/xmlregexp.c
@@ -3572,7 +3572,7 @@ xmlFAParseCharRange(xmlRegParserCtxtPtr ctxt) {
 	return;
     }
     cur = CUR;
-    if (cur != '-') {
+    if ((cur != '-') || (NXT(1) == ']')) {
         xmlRegAtomAddRange(ctxt, ctxt->atom, ctxt->neg,
 		              XML_REGEXP_CHARVAL, start, end, NULL);
 	return;
@@ -3650,15 +3650,11 @@ xmlFAParseCharGroup(xmlRegParserCtxtPtr ctxt) {
 	    ctxt->neg = !ctxt->neg;
 	    xmlFAParsePosCharGroup(ctxt);
 	    ctxt->neg = neg;
-	} else if (CUR == '-') {
+	} else if ((CUR == '-') && (NXT(1) == '[')) {
 	    int neg = ctxt->neg;
-	    NEXT;
 	    ctxt->neg = 2;
-	    if (CUR != '[') {
-		ERROR("charClassExpr: '[' expected");
-		break;
-	    }
-	    NEXT;
+	    NEXT;	/* eat the '-' */
+	    NEXT;	/* eat the '[' */
 	    xmlFAParseCharGroup(ctxt);
 	    if (CUR == ']') {
 		NEXT;