diff --git a/core/src/main/java/org/hibernate/bytecode/BytecodeProvider.java b/core/src/main/java/org/hibernate/bytecode/BytecodeProvider.java
index 682f69107a..2ad9a349e7 100644
--- a/core/src/main/java/org/hibernate/bytecode/BytecodeProvider.java
+++ b/core/src/main/java/org/hibernate/bytecode/BytecodeProvider.java
@@ -33,8 +33,8 @@ import org.hibernate.bytecode.util.FieldFilter;
  * Bytecode requirements break down into basically 3 areas<ol>
  * <li>proxy generation (both for runtime-lazy-loading and basic proxy generation)
  * {@link #getProxyFactoryFactory()}
- * <li>bean relection optimization {@link #getReflectionOptimizer}
- * <li>field-access instumentation {@link #getTransformer}
+ * <li>bean reflection optimization {@link #getReflectionOptimizer}
+ * <li>field-access instrumentation {@link #getTransformer}
  * </ol>
  *
  * @author Steve Ebersole
@@ -44,7 +44,7 @@ public interface BytecodeProvider {
 	 * Retrieve the specific factory for this provider capable of
 	 * generating run-time proxies for lazy-loading purposes.
 	 *
-	 * @return The provider specifc factory.
+	 * @return The provider specific factory.
 	 */
 	public ProxyFactoryFactory getProxyFactoryFactory();
 
diff --git a/documentation/manual/src/main/docbook/en-US/content/configuration.xml b/documentation/manual/src/main/docbook/en-US/content/configuration.xml
index 1f03ca74df..2465422482 100644
--- a/documentation/manual/src/main/docbook/en-US/content/configuration.xml
+++ b/documentation/manual/src/main/docbook/en-US/content/configuration.xml
@@ -835,7 +835,7 @@ hibernate.dialect = org.hibernate.dialect.PostgreSQLDialect</programlisting>
       </tgroup>
     </table>
 
-    <table frame="topbot" id="configuration-misc-properties" revision="10">
+    <table frame="topbot" id="configuration-misc-properties" revision="11">
       <title>Miscellaneous Properties</title>
 
       <tgroup cols="2">
@@ -917,16 +917,26 @@ hibernate.dialect = org.hibernate.dialect.PostgreSQLDialect</programlisting>
           </row>
 
           <row>
-            <entry><literal>hibernate.cglib.use_reflection_optimizer</literal></entry>
-
-            <entry>Enables the use of CGLIB instead of runtime reflection
-            (System-level property). Reflection can sometimes be useful when
-            troubleshooting. Hibernate always requires CGLIB even if you turn
-            off the optimizer. You cannot set this property in
-            <literal>hibernate.cfg.xml</literal>. <para> <emphasis
+            <entry><literal>hibernate.bytecode.use_reflection_optimizer</literal></entry>
+            
+            <entry><para>Enables the use of bytecode manipulation instead of
+            runtime reflection. This is a System-level property and cannot be set
+            in <literal>hibernate.cfg.xml</literal>.
+            Reflection can sometimes be useful when troubleshooting.
+            Hibernate always requires either CGLIB or javassist even
+            if you turn off the optimizer.</para><para> <emphasis
             role="strong">e.g.</emphasis> <literal>true</literal> |
             <literal>false</literal> </para></entry>
           </row>
+          
+          <row>
+            <entry><literal>hibernate.bytecode.provider</literal></entry>
+          
+            <entry><para>Both javassist or cglib can be used as byte manipulation
+            engines; the default is <literal>javassist</literal>.</para><para> <emphasis
+            role="strong">e.g.</emphasis> <literal>javassist</literal> |
+            <literal>cglib</literal> </para></entry>
+          </row>
         </tbody>
       </tgroup>
     </table>