diff --git a/src/Propel/Generator/Builder/Om/ExtensionQueryBuilder.php b/src/Propel/Generator/Builder/Om/ExtensionQueryBuilder.php
index dd2eabe9af..f7d287c6fc 100644
--- a/src/Propel/Generator/Builder/Om/ExtensionQueryBuilder.php
+++ b/src/Propel/Generator/Builder/Om/ExtensionQueryBuilder.php
@@ -41,26 +41,29 @@ protected function addClassOpen(&$script)
         $tableDesc = $table->getDescription();
         $baseClassName = $this->getClassNameFromBuilder($this->getQueryBuilder());
 
-        $script .= "
+        if ($this->getBuildProperty('generator.objectModel.addClassLevelComment')) {
+            $script .= "
 /**
  * Skeleton subclass for performing query and update operations on the '$tableName' table.
  *
  * $tableDesc
  *";
-        if ($this->getBuildProperty('generator.objectModel.addTimeStamp')) {
-            $now = strftime('%c');
-            $script .= "
+            if ($this->getBuildProperty('generator.objectModel.addTimeStamp')) {
+                $now = strftime('%c');
+                $script .= "
  * This class was autogenerated by Propel " . $this->getBuildProperty('general.version') . " on:
  *
  * $now
  *";
-        }
-        $script .= "
+            }
+            $script .= "
  * You should add additional methods to this class to meet the
  * application requirements.  This class will only be generated as
  * long as it does not already exist in the output directory.
  *
- */
+ */";
+        }
+        $script .= "
 class ".$this->getUnqualifiedClassName()." extends $baseClassName
 {
 ";
diff --git a/src/Propel/Generator/Builder/Om/ExtensionQueryInheritanceBuilder.php b/src/Propel/Generator/Builder/Om/ExtensionQueryInheritanceBuilder.php
index fe49a40cc6..909d3ad970 100644
--- a/src/Propel/Generator/Builder/Om/ExtensionQueryInheritanceBuilder.php
+++ b/src/Propel/Generator/Builder/Om/ExtensionQueryInheritanceBuilder.php
@@ -88,27 +88,30 @@ protected function addClassOpen(&$script)
         $baseBuilder = $this->getNewQueryInheritanceBuilder($this->getChild());
         $baseClassName = $this->getClassNameFromBuilder($baseBuilder);
 
-        $script .= "
+        if ($this->getBuildProperty('generator.objectModel.addClassLevelComment')) {
+            $script .= "
 
 /**
  * Skeleton subclass for representing a query for one of the subclasses of the '$tableName' table.
  *
  * $tableDesc
  *";
-        if ($this->getBuildProperty('generator.objectModel.addTimeStamp')) {
-            $now = strftime('%c');
-            $script .= "
+            if ($this->getBuildProperty('generator.objectModel.addTimeStamp')) {
+                $now = strftime('%c');
+                $script .= "
  * This class was autogenerated by Propel " . $this->getBuildProperty('general.version') . " on:
  *
  * $now
  *";
-        }
-        $script .= "
+            }
+            $script .= "
  * You should add additional methods to this class to meet the
  * application requirements.  This class will only be generated as
  * long as it does not already exist in the output directory.
  *
- */
+ */";
+        }
+        $script .= "
 class "  .$this->getUnqualifiedClassName() . " extends " . $baseClassName . "
 {
 ";
diff --git a/src/Propel/Generator/Builder/Om/MultiExtendObjectBuilder.php b/src/Propel/Generator/Builder/Om/MultiExtendObjectBuilder.php
index d3b2436f8f..7704d0d29c 100644
--- a/src/Propel/Generator/Builder/Om/MultiExtendObjectBuilder.php
+++ b/src/Propel/Generator/Builder/Om/MultiExtendObjectBuilder.php
@@ -131,27 +131,30 @@ protected function addClassOpen(&$script)
         $tableName = $table->getName();
         $tableDesc = $table->getDescription();
 
-        $script .= "
+        if ($this->getBuildProperty('generator.objectModel.addClassLevelComment')) {
+            $script .= "
 
 /**
  * Skeleton subclass for representing a row from one of the subclasses of the '$tableName' table.
  *
  * $tableDesc
  *";
-        if ($this->getBuildProperty('generator.objectModel.addTimeStamp')) {
-            $now = strftime('%c');
-            $script .= "
+            if ($this->getBuildProperty('generator.objectModel.addTimeStamp')) {
+                $now = strftime('%c');
+                $script .= "
  * This class was autogenerated by Propel " . $this->getBuildProperty('general.version') . " on:
  *
  * $now
  *";
         }
-        $script .= "
+            $script .= "
  * You should add additional methods to this class to meet the
  * application requirements.  This class will only be generated as
  * long as it does not already exist in the output directory.
  *
- */
+ */";
+        }
+        $script .= "
 class ".$this->getUnqualifiedClassName()." extends ".$this->getParentClassName()."
 {
 ";