diff --git a/ChangeLog b/ChangeLog
index a60ddc86..a4741fd1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Feb 10 22:08:51 CET 2002 Daniel Veillard <daniel@veillard.com>
+
+	* libxslt/attributes.c: fixed a bug reported by Norm
+
 Sun Feb 10 20:25:28 CET 2002 Daniel Veillard <daniel@veillard.com>
 
 	* python/libxml.c : fixed a small warning.
diff --git a/doc/libxslt-api.xml b/doc/libxslt-api.xml
index 708fc7b6..1e92e45c 100644
--- a/doc/libxslt-api.xml
+++ b/doc/libxslt-api.xml
@@ -621,8 +621,8 @@
       <arg name='pattern' type='const xmlChar *' info='an XSLT pattern '/>
       <arg name='doc' type='xmlDocPtr' info='the containing document '/>
       <arg name='node' type='xmlNodePtr' info='the containing element '/>
-      <arg name='style' type='xsltStylesheetPtr'/>
-      <arg name='runtime' type='xsltTransformContextPtr'/>
+      <arg name='style' type='xsltStylesheetPtr' info='the stylesheet '/>
+      <arg name='runtime' type='xsltTransformContextPtr' info='the transformation context, if done at run-time '/>
     </function>
     <function name='xsltCopy' file='transform'>
       <info>Process the xslt copy node on the source node</info>
diff --git a/doc/libxslt-refs.xml b/doc/libxslt-refs.xml
index f4467e0d..cd99b49f 100644
--- a/doc/libxslt-refs.xml
+++ b/doc/libxslt-refs.xml
@@ -2508,6 +2508,7 @@
           <ref name='xsltTestCompMatchList'/>
         </word>
         <word name='done'>
+          <ref name='xsltCompilePattern'/>
           <ref name='xsltEvalGlobalVariables'/>
           <ref name='xsltInitCtxtKeys'/>
           <ref name='xsltLoadStylesheetPI'/>
@@ -3783,6 +3784,9 @@
         <word name='run'>
           <ref name='WITH_XSLT_DEBUG'/>
         </word>
+        <word name='run-time'>
+          <ref name='xsltCompilePattern'/>
+        </word>
       </letter>
     </chunk>
     <chunk name='chunk6'>
diff --git a/libxslt/attributes.c b/libxslt/attributes.c
index 1bfcc2e6..a103d1e1 100644
--- a/libxslt/attributes.c
+++ b/libxslt/attributes.c
@@ -471,6 +471,12 @@ xsltAttributeInternal(xsltTransformContextPtr ctxt, xmlNodePtr node,
     } else if (comp->ns != NULL) {
         ns = xsltGetSpecialNamespace(ctxt, inst, comp->ns, prefix,
                                      ctxt->insert);
+    } else if (prefix != NULL) {
+	xmlNsPtr tmp;
+	tmp = xmlSearchNs(inst->doc, inst, prefix);
+	if (tmp != NULL) {
+	    ns = xsltGetNamespace(ctxt, inst, tmp, ctxt->insert);
+	}
     }
 
     if ((fromset) && (ns != NULL))
diff --git a/python/generator.py b/python/generator.py
index fb792b86..3330af67 100755
--- a/python/generator.py
+++ b/python/generator.py
@@ -288,6 +288,8 @@ unknown_types = {}
 def skip_function(name):
     if name[0:12] == "xmlXPathWrap":
         return 1
+    if name == "xsltMatchPattern":
+        return 1
 #    if name[0:11] == "xmlXPathNew":
 #        return 1
     return 0
diff --git a/python/libxsltclass.txt b/python/libxsltclass.txt
index 09764018..158f8efb 100644
--- a/python/libxsltclass.txt
+++ b/python/libxsltclass.txt
@@ -105,9 +105,6 @@ Class transformCtxt()
     namespace()
     specialNamespace()
 
-    # functions from module pattern
-    matchPattern()
-
     # functions from module templates
     attrListTemplateProcess()
     attrTemplateProcess()