diff --git a/documentation/documentation.gradle b/documentation/documentation.gradle
index 0f3eb09b3b..4f2f85654b 100644
--- a/documentation/documentation.gradle
+++ b/documentation/documentation.gradle
@@ -30,6 +30,12 @@ configurations {
     }
 }
 
+if ( JavaVersion.current().isJava8Compatible() ) {
+    tasks.withType( Javadoc ) {
+        options.addStringOption( 'Xdoclint:none', '-quiet' )
+    }
+}
+
 dependencies {
     ext.pressgangVersion = '3.0.0'
 
@@ -113,6 +119,7 @@ task aggregateJavadocs(type: Javadoc) {
         docTitle = "Hibernate JavaDoc ($project.version)"
         bottom = "Copyright &copy; 2001-$copyrightYear <a href=\"http://redhat.com\">Red Hat, Inc.</a>  All Rights Reserved."
         use = true
+        options.encoding = 'UTF-8'
         links = [ 'http://download.oracle.com/javase/6/docs/api/', 'http://download.oracle.com/javaee/6/api/' ]
         group( 'API', apiPackages.asList() )
         group( 'SPI', spiPackages.asList() )
diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/jpa/AvailableSettings.java b/hibernate-entitymanager/src/main/java/org/hibernate/jpa/AvailableSettings.java
index 1410640363..7986ada208 100644
--- a/hibernate-entitymanager/src/main/java/org/hibernate/jpa/AvailableSettings.java
+++ b/hibernate-entitymanager/src/main/java/org/hibernate/jpa/AvailableSettings.java
@@ -287,7 +287,7 @@ public interface AvailableSettings {
 	 * Specifies whether the persistence provider is to create the database schema(s) in addition to creating
 	 * database objects (tables, sequences, constraints, etc).  The value of this boolean property should be set
 	 * to {@code true} if the persistence provider is to create schemas in the database or to generate DDL that
-	 * contains “CREATE SCHEMA” commands.  If this property is not supplied (or is explicitly {@code false}), the
+	 * contains "CREATE SCHEMA" commands.  If this property is not supplied (or is explicitly {@code false}), the
 	 * provider should not attempt to create database schemas.
 	 */
 	String SCHEMA_GEN_CREATE_SCHEMAS = "javax.persistence.create-database-schemas";