diff --git a/doc/libxslt-api.xml b/doc/libxslt-api.xml
index 7e90ab71..c9f10921 100644
--- a/doc/libxslt-api.xml
+++ b/doc/libxslt-api.xml
@@ -316,7 +316,6 @@
      <exports symbol='XSLT_MARK_RES_TREE_FRAG' type='macro'/>
      <exports symbol='XSLT_GET_INTERNAL_NSMAP' type='macro'/>
      <exports symbol='XSLT_REFACTORED_KEYCOMP' type='macro'/>
-     <exports symbol='XSLT_REFACTORED_XPATHCOMP' type='macro'/>
      <exports symbol='XSLT_ITEM_NAVIGATION_FIELDS' type='macro'/>
      <exports symbol='XSLT_MAX_SORT' type='macro'/>
      <exports symbol='XSLT_RUNTIME_EXTRA' type='macro'/>
@@ -532,6 +531,7 @@
      <exports symbol='xsltInitAllDocKeys' type='function'/>
      <exports symbol='xsltDecimalFormatGetByName' type='function'/>
      <exports symbol='xsltExtensionInstructionResultFinalize' type='function'/>
+     <exports symbol='xsltParseStylesheetUser' type='function'/>
      <exports symbol='xsltPointerListFree' type='function'/>
      <exports symbol='xsltIsBlank' type='function'/>
      <exports symbol='xsltFormatNumberConversion' type='function'/>
@@ -799,9 +799,6 @@
     <macro name='XSLT_REFACTORED_VARS' file='xsltInternals'>
       <info>Internal define to enable the refactored variable part of libxslt</info>
     </macro>
-    <macro name='XSLT_REFACTORED_XPATHCOMP' file='xsltInternals'>
-      <info>Internal define to enable the optimization of the compilation of XPath expressions.</info>
-    </macro>
     <macro name='XSLT_REGISTER_FUNCTION_LOOKUP' file='functions'>
       <info>Registering macro, not general purpose at all but used in different modules.</info>
     </macro>
@@ -958,7 +955,6 @@ in a parsing episode'/>
 *'/>
       <field name='strict' type='int' info=''/>
       <field name='psData' type='xsltPrincipalStylesheetDataPtr' info=''/>
-      <field name='xpathCtxt' type='xmlXPathContextPtr' info=''/>
       <field name='unknownItem' type='xsltStyleItemUknownPtr' info=''/>
       <field name='hasNsAliases' type='int' info=' Indicator if there was an xsl:namespace-alias.'/>
       <field name='nsAliases' type='xsltNsAliasPtr' info=''/>
@@ -1455,6 +1451,7 @@ TODO: We need to get rid of this.
 *'/>
       <field name='forwards_compatible' type='int' info=''/>
       <field name='namedTemplates' type='xmlHashTablePtr' info=' hash table of named templates'/>
+      <field name='xpathCtxt' type='xmlXPathContextPtr' info=''/>
     </struct>
     <typedef name='xsltStylesheetPtr' file='xsltInternals' type='xsltStylesheet *'/>
     <struct name='xsltTemplate' file='xsltInternals' type='struct _xsltTemplate'>
@@ -1570,6 +1567,8 @@ exits'/>
       <field name='depth' type='int' info=' Needed to catch recursions'/>
       <field name='maxTemplateDepth' type='int' info=''/>
       <field name='maxTemplateVars' type='int' info=''/>
+      <field name='opLimit' type='unsigned long' info=''/>
+      <field name='opCount' type='unsigned long' info=''/>
     </struct>
     <typedef name='xsltTransformContextPtr' file='xsltInternals' type='xsltTransformContext *'/>
     <typedef name='xsltTransformState' file='xsltInternals' type='enum'/>
@@ -2658,6 +2657,12 @@ exits'/>
       <arg name='ret' type='xsltStylesheetPtr' info='the XSLT stylesheet (the current stylesheet-level)'/>
       <arg name='doc' type='xmlDocPtr' info='and xmlDoc parsed XML'/>
     </function>
+    <function name='xsltParseStylesheetUser' file='xsltInternals'>
+      <info>Parse an XSLT stylesheet with a user-provided stylesheet struct.</info>
+      <return type='int' info='0 if successful, -1 in case of error.'/>
+      <arg name='style' type='xsltStylesheetPtr' info='pointer to the stylesheet'/>
+      <arg name='doc' type='xmlDocPtr' info='an xmlDoc parsed XML'/>
+    </function>
     <function name='xsltParseStylesheetVariable' file='variables'>
       <info>Registers a local XSLT &apos;variable&apos; instruction at transformation time and evaluates its value.</info>
       <return type='void'/>
diff --git a/doc/libxslt-refs.xml b/doc/libxslt-refs.xml
index eda40e68..0d49f5b5 100644
--- a/doc/libxslt-refs.xml
+++ b/doc/libxslt-refs.xml
@@ -89,7 +89,6 @@
     <reference name='XSLT_PAT_NO_PRIORITY' href='html/libxslt-xsltInternals.html#XSLT_PAT_NO_PRIORITY'/>
     <reference name='XSLT_REFACTORED_KEYCOMP' href='html/libxslt-xsltInternals.html#XSLT_REFACTORED_KEYCOMP'/>
     <reference name='XSLT_REFACTORED_VARS' href='html/libxslt-xsltInternals.html#XSLT_REFACTORED_VARS'/>
-    <reference name='XSLT_REFACTORED_XPATHCOMP' href='html/libxslt-xsltInternals.html#XSLT_REFACTORED_XPATHCOMP'/>
     <reference name='XSLT_REGISTER_FUNCTION_LOOKUP' href='html/libxslt-functions.html#XSLT_REGISTER_FUNCTION_LOOKUP'/>
     <reference name='XSLT_REGISTER_VARIABLE_LOOKUP' href='html/libxslt-variables.html#XSLT_REGISTER_VARIABLE_LOOKUP'/>
     <reference name='XSLT_RUNTIME_EXTRA' href='html/libxslt-xsltInternals.html#XSLT_RUNTIME_EXTRA'/>
@@ -400,6 +399,7 @@
     <reference name='xsltParseStylesheetOutput' href='html/libxslt-xsltInternals.html#xsltParseStylesheetOutput'/>
     <reference name='xsltParseStylesheetParam' href='html/libxslt-variables.html#xsltParseStylesheetParam'/>
     <reference name='xsltParseStylesheetProcess' href='html/libxslt-xsltInternals.html#xsltParseStylesheetProcess'/>
+    <reference name='xsltParseStylesheetUser' href='html/libxslt-xsltInternals.html#xsltParseStylesheetUser'/>
     <reference name='xsltParseStylesheetVariable' href='html/libxslt-variables.html#xsltParseStylesheetVariable'/>
     <reference name='xsltParseTemplateContent' href='html/libxslt-xsltInternals.html#xsltParseTemplateContent'/>
     <reference name='xsltPointerList' href='html/libxslt-xsltInternals.html#xsltPointerList'/>
@@ -678,7 +678,6 @@
       <ref name='XSLT_PAT_NO_PRIORITY'/>
       <ref name='XSLT_REFACTORED_KEYCOMP'/>
       <ref name='XSLT_REFACTORED_VARS'/>
-      <ref name='XSLT_REFACTORED_XPATHCOMP'/>
       <ref name='XSLT_REGISTER_FUNCTION_LOOKUP'/>
       <ref name='XSLT_REGISTER_VARIABLE_LOOKUP'/>
       <ref name='XSLT_RUNTIME_EXTRA'/>
@@ -993,6 +992,7 @@
       <ref name='xsltParseStylesheetOutput'/>
       <ref name='xsltParseStylesheetParam'/>
       <ref name='xsltParseStylesheetProcess'/>
+      <ref name='xsltParseStylesheetUser'/>
       <ref name='xsltParseStylesheetVariable'/>
       <ref name='xsltParseTemplateContent'/>
       <ref name='xsltPointerList'/>
@@ -1471,6 +1471,7 @@
       <ref name='xsltParseStylesheetDoc'/>
       <ref name='xsltParseStylesheetImportedDoc'/>
       <ref name='xsltParseStylesheetProcess'/>
+      <ref name='xsltParseStylesheetUser'/>
       <ref name='xsltProfileStylesheet'/>
       <ref name='xsltRegisterLocalRVT'/>
       <ref name='xsltRegisterPersistRVT'/>
@@ -1782,6 +1783,7 @@
       <ref name='xsltParseStylesheetInclude'/>
       <ref name='xsltParseStylesheetOutput'/>
       <ref name='xsltParseStylesheetProcess'/>
+      <ref name='xsltParseStylesheetUser'/>
       <ref name='xsltParseTemplateContent'/>
       <ref name='xsltPreComputeExtModuleElement'/>
       <ref name='xsltPreComputeFunction'/>
@@ -2248,7 +2250,6 @@
       <ref name='XSLT_PAT_NO_PRIORITY'/>
       <ref name='XSLT_REFACTORED_KEYCOMP'/>
       <ref name='XSLT_REFACTORED_VARS'/>
-      <ref name='XSLT_REFACTORED_XPATHCOMP'/>
       <ref name='XSLT_RUNTIME_EXTRA'/>
       <ref name='XSLT_RUNTIME_EXTRA_FREE'/>
       <ref name='XSLT_RUNTIME_EXTRA_LST'/>
@@ -2356,6 +2357,7 @@
       <ref name='xsltParseStylesheetImportedDoc'/>
       <ref name='xsltParseStylesheetOutput'/>
       <ref name='xsltParseStylesheetProcess'/>
+      <ref name='xsltParseStylesheetUser'/>
       <ref name='xsltParseTemplateContent'/>
       <ref name='xsltPointerList'/>
       <ref name='xsltPointerListAddSize'/>
@@ -2945,7 +2947,6 @@
           <ref name='XSLT_FAST_IF'/>
           <ref name='XSLT_REFACTORED_KEYCOMP'/>
           <ref name='XSLT_REFACTORED_VARS'/>
-          <ref name='XSLT_REFACTORED_XPATHCOMP'/>
           <ref name='xsltFreeRVTs'/>
         </word>
       </letter>
@@ -3126,6 +3127,9 @@
         <word name='POSIX'>
           <ref name='XSLT_LOCALE_POSIX'/>
         </word>
+        <word name='Parse'>
+          <ref name='xsltParseStylesheetUser'/>
+        </word>
         <word name='Parser'>
           <ref name='xsltDocumentFunction'/>
           <ref name='xsltElementAvailableFunction'/>
@@ -3565,6 +3569,7 @@
           <ref name='xsltParseStylesheetDoc'/>
           <ref name='xsltParseStylesheetImportedDoc'/>
           <ref name='xsltParseStylesheetProcess'/>
+          <ref name='xsltParseStylesheetUser'/>
           <ref name='xsltProfileStylesheet'/>
           <ref name='xsltRunStylesheet'/>
           <ref name='xsltRunStylesheetUser'/>
@@ -4344,7 +4349,6 @@
           <ref name='XSLT_REFACTORED_KEYCOMP'/>
         </word>
         <word name='compilation'>
-          <ref name='XSLT_REFACTORED_XPATHCOMP'/>
           <ref name='_xsltCompilerCtxt'/>
           <ref name='_xsltStylesheet'/>
           <ref name='xsltDocLoaderFunc'/>
@@ -4644,7 +4648,6 @@
           <ref name='XSLT_FAST_IF'/>
           <ref name='XSLT_REFACTORED_KEYCOMP'/>
           <ref name='XSLT_REFACTORED_VARS'/>
-          <ref name='XSLT_REFACTORED_XPATHCOMP'/>
           <ref name='XSLT_RUNTIME_EXTRA'/>
         </word>
         <word name='defined'>
@@ -4851,7 +4854,6 @@
           <ref name='XSLT_FAST_IF'/>
           <ref name='XSLT_REFACTORED_KEYCOMP'/>
           <ref name='XSLT_REFACTORED_VARS'/>
-          <ref name='XSLT_REFACTORED_XPATHCOMP'/>
         </word>
         <word name='enabled'>
           <ref name='_xsltCompilerNodeInfo'/>
@@ -5014,7 +5016,6 @@
           <ref name='xsltXPathCompileFlags'/>
         </word>
         <word name='expressions'>
-          <ref name='XSLT_REFACTORED_XPATHCOMP'/>
           <ref name='_xsltStylesheet'/>
           <ref name='xsltEvalAttrValueTemplate'/>
           <ref name='xsltEvalStaticAttrValueTemplate'/>
@@ -6436,7 +6437,6 @@
           <ref name='xsltSecurityForbid'/>
         </word>
         <word name='optimization'>
-          <ref name='XSLT_REFACTORED_XPATHCOMP'/>
           <ref name='_xsltTransformContext'/>
         </word>
         <word name='option'>
@@ -6588,6 +6588,7 @@
           <ref name='xsltParseStylesheetDoc'/>
           <ref name='xsltParseStylesheetImportedDoc'/>
           <ref name='xsltParseStylesheetProcess'/>
+          <ref name='xsltParseStylesheetUser'/>
           <ref name='xsltProfileStylesheet'/>
           <ref name='xsltQuoteUserParams'/>
           <ref name='xsltRunStylesheet'/>
@@ -7573,6 +7574,7 @@
         </word>
         <word name='struct'>
           <ref name='xsltInitElemPreComp'/>
+          <ref name='xsltParseStylesheetUser'/>
         </word>
         <word name='structure'>
           <ref name='XSLT_ITEM_COMPATIBILITY_FIELDS'/>
@@ -7678,6 +7680,7 @@
           <ref name='xsltSetDebuggerCallbacks'/>
         </word>
         <word name='successful'>
+          <ref name='xsltParseStylesheetUser'/>
           <ref name='xsltRegisterExtModuleElement'/>
           <ref name='xsltRegisterExtModuleFunction'/>
           <ref name='xsltRegisterExtModuleTopLevel'/>
@@ -8087,6 +8090,9 @@
         <word name='user-code'>
           <ref name='xsltFreeRVTs'/>
         </word>
+        <word name='user-provided'>
+          <ref name='xsltParseStylesheetUser'/>
+        </word>
         <word name='users!'>
           <ref name='xsltLocalVariablePush'/>
         </word>
@@ -8307,6 +8313,7 @@
           <ref name='xsltInitCtxtExts'/>
           <ref name='xsltLocaleStrcmp'/>
           <ref name='xsltParseStylesheetCallerParam'/>
+          <ref name='xsltParseStylesheetUser'/>
           <ref name='xsltStrxfrm'/>
         </word>
         <word name='with-params'>
@@ -8362,6 +8369,7 @@
           <ref name='xsltParseStylesheetDoc'/>
           <ref name='xsltParseStylesheetImportedDoc'/>
           <ref name='xsltParseStylesheetProcess'/>
+          <ref name='xsltParseStylesheetUser'/>
           <ref name='xsltReleaseRVT'/>
         </word>
         <word name='xmlDocPtr'>
diff --git a/doc/symbols.xml b/doc/symbols.xml
index 52f1cffe..502a966d 100644
--- a/doc/symbols.xml
+++ b/doc/symbols.xml
@@ -319,4 +319,7 @@
     <symbol file="xsltInternals">xsltFlagRVTs</symbol>
     <symbol file="xsltInternals">xsltDecimalFormatGetByQName</symbol>
   </release>
+  <release version="1.1.34">
+    <symbol file="xsltInternals">xsltParseStylesheetUser</symbol>
+  </release>
 </symbols>
diff --git a/libxslt/libxslt.syms b/libxslt/libxslt.syms
index 684cd1bd..07c0a660 100644
--- a/libxslt/libxslt.syms
+++ b/libxslt/libxslt.syms
@@ -499,3 +499,10 @@ LIBXML2_1.1.30 {
   xsltDecimalFormatGetByQName;
 } LIBXML2_1.1.27;
 
+LIBXML2_1.1.34 {
+    global:
+
+# xsltInternals
+  xsltParseStylesheetUser;
+} LIBXML2_1.1.30;
+