diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/CommentGeneration.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/CommentGeneration.hbm.xml
new file mode 100644
index 0000000000..d62f999ec5
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/CommentGeneration.hbm.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<!--
+  ~ Hibernate, Relational Persistence for Idiomatic Java
+  ~
+  ~ License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+  ~ See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+        "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+        "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping package="org.hibernate.test.schemaupdate">
+
+    <class name="Version" table="version">
+        <id name="id"/>
+        <property name="description">
+            <column name="description">
+                <comment>This is a column comment</comment>
+            </column>
+        </property>
+    </class>
+
+</hibernate-mapping>
\ No newline at end of file
diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/CommentGenerationTest.java b/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/CommentGenerationTest.java
new file mode 100644
index 0000000000..3139122f1f
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/CommentGenerationTest.java
@@ -0,0 +1,72 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+ * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ */
+package org.hibernate.test.schemaupdate;
+
+import java.io.File;
+import java.nio.file.Files;
+import java.util.EnumSet;
+
+import org.hibernate.boot.MetadataSources;
+import org.hibernate.boot.registry.StandardServiceRegistry;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.boot.spi.MetadataImplementor;
+import org.hibernate.cfg.Environment;
+import org.hibernate.dialect.Dialect;
+import org.hibernate.tool.hbm2ddl.SchemaUpdate;
+import org.hibernate.tool.schema.TargetType;
+
+import org.junit.Test;
+
+import org.hibernate.testing.TestForIssue;
+
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertThat;
+
+/**
+ * @author Andrea Boriero
+ */
+@TestForIssue(jiraKey = "HHH-10635")
+public class CommentGenerationTest {
+
+	@Test
+	public void testSchemaUpdateScriptGeneration() throws Exception {
+		final String resource = "org/hibernate/test/schemaupdate/CommentGeneration.hbm.xml";
+		StandardServiceRegistry ssr = new StandardServiceRegistryBuilder()
+				.applySetting( Environment.HBM2DDL_AUTO, "none" )
+				.applySetting( Environment.DIALECT, SupportCommentDialect.class.getName() )
+				.build();
+		try {
+			File output = File.createTempFile( "update_script", ".sql" );
+			output.deleteOnExit();
+
+			final MetadataImplementor metadata = (MetadataImplementor) new MetadataSources( ssr )
+					.addResource( resource )
+					.buildMetadata();
+			metadata.validate();
+
+			new SchemaUpdate()
+					.setHaltOnError( true )
+					.setOutputFile( output.getAbsolutePath() )
+					.setDelimiter( ";" )
+					.setFormat( true )
+					.execute( EnumSet.of( TargetType.SCRIPT ), metadata );
+
+			String fileContent = new String( Files.readAllBytes( output.toPath() ) );
+			assertThat( fileContent.contains( "comment on column version.description " ), is( true ) );
+		}
+		finally {
+			StandardServiceRegistryBuilder.destroy( ssr );
+		}
+	}
+
+	public static class SupportCommentDialect extends Dialect{
+		@Override
+		public boolean supportsCommentOn() {
+			return true;
+		}
+	}
+}