diff --git a/src/Propel/Generator/Behavior/Auditable/AuditableBehavior.php b/src/Propel/Generator/Behavior/Auditable/AuditableBehavior.php
new file mode 100644
index 000000000..d5828aa63
--- /dev/null
+++ b/src/Propel/Generator/Behavior/Auditable/AuditableBehavior.php
@@ -0,0 +1,155 @@
+<?php
+
+/**
+ * MIT License. This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Propel\Generator\Behavior\Auditable;
+
+use Propel\Generator\Behavior\SyncedTable\TableSyncer;
+use Propel\Generator\Behavior\Util\InsertCodeBehavior;
+use Propel\Generator\Builder\Om\ObjectBuilder;
+use Propel\Generator\Model\PropelTypes;
+use Propel\Generator\Model\Table;
+use stdClass;
+
+class AuditableBehavior extends AuditableBehaviorDeclaration
+{
+    /**
+     * @see \Propel\Generator\Model\Behavior::getObjectBuilderModifier()
+     *
+     * @return $this|\Propel\Generator\Behavior\Auditable\AuditableObjectModifier|\stdClass
+     */
+    public function getObjectBuilderModifier()
+    {
+        return ($this->omitOnSkipSql() && $this->table->isSkipSql()) ? new stdClass() : new AuditableObjectModifier($this);
+    }
+
+    /**
+     * @return void
+     */
+    public function modifyTable(): void
+    {
+        parent::modifyTable();
+        $this->addAggregationColumn($this->table);
+    }
+
+    /**
+     * @param \Propel\Generator\Model\Table $table
+     *
+     * @return void
+     */
+    public function addAggregationColumn(Table $table): void
+    {
+        $columnName = $this->aggregationColumnNameOnSource();
+        if (!$columnName) {
+            return;
+        }
+        TableSyncer::addColumnIfNotExists($table, $columnName, [
+            'type' => 'INTEGER',
+            'defaultValue' => 0,
+            'defaultExpression' => 0,
+            'required' => true,
+        ]);
+    }
+
+    /**
+     * @param \Propel\Generator\Model\Table $syncedTable
+     * @param bool $tableExistsInSchema
+     *
+     * @return void
+     */
+    public function addTableElements(Table $syncedTable, bool $tableExistsInSchema): void
+    {
+        parent::addTableElements($syncedTable, $tableExistsInSchema);
+        $auditedAtColumn = TableSyncer::addColumnIfNotExists($syncedTable, $this->getAuditedAtFieldName(), [
+            'type' => 'TIMESTAMP',
+            'defaultExpr' => 'CURRENT_TIMESTAMP',
+        ]);
+        $auditEventColumn = TableSyncer::addColumnIfNotExists($syncedTable, $this->getAuditEventFieldName(), [
+            'type' => PropelTypes::ENUM,
+            'valueSet' => 'insert, update, delete',
+            'required' => true,
+        ]);
+        $internalChangedValuesColumn = TableSyncer::addColumnIfNotExists($syncedTable, $this->getInternalChangedValuesFieldName(), [
+            'type' => $this->getChangedValuesFieldType(),
+            'size' => $this->getChangedValuesFieldSize(),
+        ]);
+
+        $fk = $this->findSyncedRelation($syncedTable->getForeignKeys());
+        $internalChangedValuesColumnPhpName = $internalChangedValuesColumn->getPhpName();
+
+        InsertCodeBehavior::addToTable($this, $syncedTable, [
+            'preInsert' => '$this->' . $auditedAtColumn->getName() . ' ??= (new DateTime())->format(\'Y-m-d H:i:s.u\');',
+            'objectMethods' => fn (ObjectBuilder $builder) => $this->renderLocalTemplate('auditObjectMethods', [
+                'internalChangedValuesColumnPhpName' => $internalChangedValuesColumnPhpName,
+                'restoredChangedValuesColumnPhpName' => $this->getChangedValuesFieldPhpName(),
+                'auditObjectName' => $syncedTable->getPhpName(),
+                'auditIdColumnName' => $this->addPkAs(),
+                'auditedAtColumnName' => $auditedAtColumn->getName(),
+                'syncedPkColumns' => $this->getSyncedPrimaryKeyColumns($syncedTable),
+                'relationToSourceName' => $builder->getFKPhpNameAffix($fk, false),
+                'auditEventColumnPhpName' => $auditEventColumn->getPhpName(),
+                'queryClassName' => $builder->getQueryClassName(),
+            ]),
+            'objectFilter' => fn (string $script) => $this->removeInternalFieldFromToArrayCode($script, $internalChangedValuesColumnPhpName),
+        ]);
+    }
+
+    /**
+     * @see \Propel\Generator\Builder\Om\ObjectBuilder::addToArray()
+     *
+     * @param string $script
+     * @param string $columnPhpName
+     *
+     * @return string
+     */
+    protected function removeInternalFieldFromToArrayCode(string $script, string $columnPhpName): string
+    {
+        $pattern = '/^\s+\$keys\[\d+\] => \$this->get' . $columnPhpName . '\(\),\n/m';// remove line "$keys[5] => $this->getInternalChangedValues(),"
+
+        return preg_replace($pattern, '', $script, 1);
+    }
+
+    /**
+     * @return array<array{column: \Propel\Generator\Model\Column, isOmited: bool}>
+     */
+    public function selectAuditedFields(): array
+    {
+        $ignoredFields = $this->getIgnoredFieldNames();
+        $omitedFields = $this->getOmitValueFields();
+        $omitedTypes = $this->getOmitValueFieldTypes();
+        $auditedFields = [];
+
+        foreach ($this->table->getColumns() as $column) {
+            $fieldName = $column->getName();
+            if (in_array($fieldName, $ignoredFields)) {
+                continue;
+            }
+            $isOmited = (in_array($fieldName, $omitedFields) || in_array($column->getType(), $omitedTypes));
+            $auditedFields[] = [
+                'column' => $column,
+                'isOmited' => $isOmited,
+            ];
+        }
+
+        return $auditedFields;
+    }
+
+    /**
+     * @see Propel\Generator\Model\Behavior\Behavior::renderTemplate()
+     *
+     * @param string $filename
+     * @param array $vars
+     *
+     * @return string
+     */
+    public function renderLocalTemplate(string $filename, array $vars = []): string
+    {
+        $templatePath = $this->getDirname() . '/templates/';
+
+        return $this->renderTemplate($filename, $vars, $templatePath);
+    }
+}
diff --git a/src/Propel/Generator/Behavior/Auditable/AuditableBehaviorDeclaration.php b/src/Propel/Generator/Behavior/Auditable/AuditableBehaviorDeclaration.php
new file mode 100644
index 000000000..c127403f9
--- /dev/null
+++ b/src/Propel/Generator/Behavior/Auditable/AuditableBehaviorDeclaration.php
@@ -0,0 +1,282 @@
+<?php
+
+/**
+ * MIT License. This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Propel\Generator\Behavior\Auditable;
+
+use Propel\Generator\Behavior\SyncedTable\SyncedTableBehavior;
+use Propel\Generator\Behavior\SyncedTable\SyncedTableBehaviorDeclaration;
+use Propel\Generator\Behavior\SyncedTable\SyncedTableException;
+use Propel\Generator\Model\Column;
+use Propel\Generator\Model\PropelTypes;
+
+class AuditableBehaviorDeclaration extends SyncedTableBehavior
+{
+    /**
+     * @see \Propel\Generator\Behavior\SyncedTable\SyncedTableBehavior::DEFAULT_SYNCED_TABLE_SUFFIX
+     *
+     * @var string DEFAULT_SYNCED_TABLE_SUFFIX
+     */
+    protected const DEFAULT_SYNCED_TABLE_SUFFIX = '_audit';
+
+    /**
+     * @var string
+     */
+    public const PARAMETER_KEY_ADD_PK = 'id_field_name';
+
+    /**
+     * @var string
+     */
+    public const PARAMETER_KEY_AUDITED_AT_FIELD_NAME = 'audited_at_field_name';
+
+    /**
+     * @var string
+     */
+    public const PARAMETER_KEY_AUDIT_EVENT_FIELD_NAME = 'audit_event_field_name';
+
+    /**
+     * @var string
+     */
+    public const PARAMETER_KEY_CHANGED_VALUES_FIELD_NAME = 'changed_values_field_name';
+
+    /**
+     * @var string
+     */
+    public const PARAMETER_KEY_CHANGED_VALUES_FIELD_TYPE = 'changed_values_field_type';
+
+    /**
+     * @var string
+     */
+    public const PARAMETER_KEY_CHANGED_VALUES_FIELD_SIZE = 'changed_values_field_size';
+
+    /**
+     * @var string
+     */
+    public const PARAMETER_KEY_IGNORE_FIELDS = 'ignore_fields';
+
+    /**
+     * @var string
+     */
+    public const PARAMETER_KEY_OMIT_VALUE_FIELDS = 'omit_value_fields';
+
+    /**
+     * @var string
+     */
+    public const PARAMETER_KEY_OMIT_VALUE_TYPES = 'omit_value_types';
+
+    /**
+     * Placeholder for omited column values (defaults to 'changed')
+     *
+     * @var string
+     */
+    public const PARAMETER_KEY_OMIT_VALUE = 'omit_value';
+
+    /**
+     * By default, the insert audit is empty, this parameter allows to specify
+     * columns that should be added.
+     *
+     * @var string
+     */
+    public const PARAMETER_KEY_AUDITED_COLUMNS_ON_INSERT = 'audited_columns_on_insert';
+
+    /**
+     * Remove audit when source row is deleted (defaults to false).
+     *
+     * @var string
+     */
+    public const PARAMETER_KEY_CASCADE_DELETE = 'cascade_delete';
+
+    /**
+     * Name of the aggregation column or "true" for "number_of_audits".
+     *
+     * @var string
+     */
+    public const PARAMETER_KEY_ADD_AGGREGATION_TO_SOURCE = 'add_aggregation_to_source';
+
+    /**
+     * @see \Propel\Generator\Behavior\SyncedTable\SyncedTableBehavior::getDefaultParameters()
+     *
+     * @return array
+     */
+    protected function getDefaultParameters(): array
+    {
+        // set SyncedTableBehavior values
+        return [
+            static::PARAMETER_KEY_ADD_PK => 'audit_id',
+            static::PARAMETER_KEY_SYNC_PK_ONLY => 'true',
+            static::PARAMETER_KEY_COLUMN_PREFIX => 'true',
+        ];
+    }
+
+    /**
+     * @throws \Propel\Generator\Behavior\SyncedTable\SyncedTableException
+     *
+     * @return void
+     */
+    public function validateParameters(): void
+    {
+        $disallowedParameters = [
+            SyncedTableBehaviorDeclaration::PARAMETER_KEY_EMPTY_ACCESSOR_COLUMNS,
+            SyncedTableBehaviorDeclaration::PARAMETER_KEY_IGNORE_COLUMNS,
+            SyncedTableBehaviorDeclaration::PARAMETER_KEY_INHERIT_FOREIGN_KEY_CONSTRAINTS,
+            SyncedTableBehaviorDeclaration::PARAMETER_KEY_INHERIT_FOREIGN_KEY_RELATIONS,
+            SyncedTableBehaviorDeclaration::PARAMETER_KEY_SYNC_INDEXES,
+            SyncedTableBehaviorDeclaration::PARAMETER_KEY_SYNC_UNIQUE_AS,
+        ];
+
+        foreach ($disallowedParameters as $disallowedParameter) {
+            if (array_key_exists($disallowedParameter, $this->parameters)) {
+                throw new SyncedTableException($this, "Use of parameter '$disallowedParameter' is not allowed.");
+            }
+        }
+
+        parent::validateParameters();
+        $this->checkColumnsInParameterExistInTable(static::PARAMETER_KEY_IGNORE_FIELDS, true);
+        $this->checkColumnsInParameterExistInTable(static::PARAMETER_KEY_OMIT_VALUE_FIELDS, true);
+        $this->checkColumnsInParameterExistInTable(static::PARAMETER_KEY_AUDITED_COLUMNS_ON_INSERT, true);
+    }
+
+    /**
+     * @return string
+     */
+    public function getAuditedAtFieldName(): string
+    {
+        return $this->getParameter(static::PARAMETER_KEY_AUDITED_AT_FIELD_NAME, 'audited_at');
+    }
+
+    /**
+     * @return string
+     */
+    public function getAuditEventFieldName(): string
+    {
+        return $this->getParameter(static::PARAMETER_KEY_AUDIT_EVENT_FIELD_NAME, 'audit_event');
+    }
+
+    /**
+     * @return string
+     */
+    public function getChangedValuesFieldName(): string
+    {
+        return $this->getParameter(static::PARAMETER_KEY_CHANGED_VALUES_FIELD_NAME, 'changed_values');
+    }
+
+    /**
+     * @return string
+     */
+    public function getChangedValuesFieldPhpName(): string
+    {
+        return Column::generatePhpName($this->getChangedValuesFieldName());
+    }
+
+    /**
+     * @return string
+     */
+    public function getInternalChangedValuesFieldName(): string
+    {
+        return 'internal_' . $this->getChangedValuesFieldName();
+    }
+
+    /**
+     * @return string
+     */
+    public function getChangedValuesFieldType(): string
+    {
+        return $this->getParameter(static::PARAMETER_KEY_CHANGED_VALUES_FIELD_TYPE, PropelTypes::JSON);
+    }
+
+    /**
+     * @return int|null
+     */
+    public function getChangedValuesFieldSize(): ?int
+    {
+        return $this->getParameterInt(static::PARAMETER_KEY_CHANGED_VALUES_FIELD_SIZE);
+    }
+
+    /**
+     * @return array<string>
+     */
+    public function getIgnoredFieldNames(): array
+    {
+        $val = $this->getParameterCsv(static::PARAMETER_KEY_IGNORE_FIELDS);
+        if ($this->aggregationColumnNameOnSource()) {
+            $val[] = $this->aggregationColumnNameOnSource();
+        }
+
+        return $val;
+    }
+
+    /**
+     * @return array<string>
+     */
+    public function getOmitValueFields(): array
+    {
+        return $this->getParameterCsv(static::PARAMETER_KEY_OMIT_VALUE_FIELDS);
+    }
+
+    /**
+     * @return array<string>
+     */
+    public function getOmitValueFieldTypes(): array
+    {
+        return $this->getParameterCsv(static::PARAMETER_KEY_OMIT_VALUE_TYPES, ['BLOB, CLOB']);
+    }
+
+    /**
+     * @return string
+     */
+    public function getOmitValue(): string
+    {
+        return $this->getParameter(static::PARAMETER_KEY_OMIT_VALUE, 'changed');
+    }
+
+    /**
+     * @return array<string>
+     */
+    public function getAuditedColumnsOnInsert(): array
+    {
+        return $this->getParameterCsv(static::PARAMETER_KEY_AUDITED_COLUMNS_ON_INSERT);
+    }
+
+    /**
+     * @see \Propel\Generator\Behavior\SyncedTable\SyncedTableBehaviorDeclaration::getRelation()
+     *
+     * @return array|true
+     */
+    public function getRelation()
+    {
+        $relation = parent::getRelation();
+        if (!is_array($relation)) {
+            $relation = [];
+        }
+        if ($this->isCascadeDeletes()) {
+            $relation['onDelete'] = 'cascade';
+        }
+
+        return $relation ?: true;
+    }
+
+    /**
+     * @return bool
+     */
+    protected function isCascadeDeletes(): bool
+    {
+        return $this->getParameterBool(static::PARAMETER_KEY_CASCADE_DELETE, false);
+    }
+
+    /**
+     * @return string|null
+     */
+    public function aggregationColumnNameOnSource(): ?string
+    {
+        $val = $this->getParameter(static::PARAMETER_KEY_ADD_AGGREGATION_TO_SOURCE);
+        if (!$val) {
+            return null;
+        }
+
+        return in_array(strtolower($val), ['true', '1']) ? 'number_of_audits' : $val;
+    }
+}
diff --git a/src/Propel/Generator/Behavior/Auditable/AuditableObjectModifier.php b/src/Propel/Generator/Behavior/Auditable/AuditableObjectModifier.php
new file mode 100644
index 000000000..5567b2cbe
--- /dev/null
+++ b/src/Propel/Generator/Behavior/Auditable/AuditableObjectModifier.php
@@ -0,0 +1,241 @@
+<?php
+
+/**
+ * MIT License. This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Propel\Generator\Behavior\Auditable;
+
+use Propel\Generator\Builder\Om\ObjectBuilder;
+
+class AuditableObjectModifier
+{
+    /**
+     * @var string
+     */
+    private $dataRowAttributeName = '_dataRow';
+
+    /**
+     * @var \Propel\Generator\Behavior\Auditable\AuditableBehavior
+     */
+    protected $behavior;
+
+    /**
+     * @param \Propel\Generator\Behavior\Auditable\AuditableBehavior $behavior
+     */
+    public function __construct(AuditableBehavior $behavior)
+    {
+        $this->behavior = $behavior;
+    }
+
+    /**
+     * @see \Propel\Generator\Model\Behavior::objectFilter()
+     *
+     * @param \Propel\Generator\Builder\Om\ObjectBuilder $objectBuilder
+     *
+     * @return string
+     */
+    public function objectAttributes(ObjectBuilder $objectBuilder)
+    {
+        return "
+/**
+ * The data row this object was hydrated from.
+ * 
+ * @var array|null 
+ */
+protected \${$this->dataRowAttributeName} = null;
+";
+
+        // end auditable behavior
+    }
+
+    /**
+     * @param \Propel\Generator\Builder\Om\ObjectBuilder $objectBuilder
+     *
+     * @return string
+     */
+    public function objectMethods(ObjectBuilder $objectBuilder): string
+    {
+        $table = $this->behavior->getSyncedTable();
+        $fk = $this->behavior->findSyncedRelation($objectBuilder->getTable()->getReferrers());
+        $getPhpNameForFieldName = fn (string $fieldName) => $table->getColumn($fieldName)->getPhpName();
+
+        return $this->behavior->renderLocalTemplate('sourceObjectMethods', [
+            'objectBuilder' => $objectBuilder,
+            'fk' => $fk,
+            'dataRowAttributeName' => $this->dataRowAttributeName,
+            'table' => $table,
+
+            'auditedFields' => $this->behavior->selectAuditedFields(),
+            'omitValue' => $this->behavior->getOmitValue(),
+
+            'internalChangedValuesColumnPhpName' => $getPhpNameForFieldName($this->behavior->getInternalChangedValuesFieldName()),
+            'auditEventColumnPhpName' => $getPhpNameForFieldName($this->behavior->getAuditEventFieldName()),
+        ]);
+    }
+
+    /**
+     * @see \Propel\Generator\Model\Behavior::objectFilter()
+     *
+     * @param string $script
+     * @param \Propel\Generator\Builder\Om\ObjectBuilder $objectBuilder
+     *
+     * @return void
+     */
+    public function objectFilter(string &$script, ObjectBuilder $objectBuilder)
+    {
+        $script = $this->updateHydrateCode($script);
+    }
+
+    /**
+     * @see \Propel\Generator\Builder\Om\ObjectBuilder::addHydrate()
+     *
+     * @param string $script
+     *
+     * @return string
+     */
+    protected function updateHydrateCode(string $script): string
+    {
+        $internalColumnPhpName =
+            $pattern = '/^\s*(public function hydrate\(.*\v\s*\{\n)/m'; // hydate() function header up until newline after '{'
+        $firstLine = "
+            \$this->{$this->dataRowAttributeName} = \$row;
+
+        ";
+
+        return preg_replace_callback($pattern, fn (array $match) => "{$match[0]}{$firstLine}", $script, 1);
+    }
+
+    /**
+     * @param \Propel\Generator\Builder\Om\ObjectBuilder $objectBuilder
+     *
+     * @return string
+     */
+    public function preUpdate(ObjectBuilder $objectBuilder)
+    {
+        $table = $this->behavior->getSyncedTable();
+        $auditObjectClass = $table->getPhpName();
+        $fk = $this->behavior->findSyncedRelation($objectBuilder->getTable()->getReferrers());
+        $relationName = $objectBuilder->getRefFKPhpNameAffix($fk, false);
+        $incrementStatement = $this->getIncrementAggregationColumnStatement("\n    ");
+
+        return <<<EOT
+\$audit = \$this->create{$auditObjectClass}('update');
+if (\$ret && \$audit) {
+    \$this->add{$relationName}(\$audit);{$incrementStatement}
+}
+EOT;
+    }
+
+    /**
+     * @param \Propel\Generator\Builder\Om\ObjectBuilder $objectBuilder
+     *
+     * @return string
+     */
+    public function preInsert(ObjectBuilder $objectBuilder)
+    {
+        $incrementStatement = $this->getIncrementAggregationColumnStatement();
+
+        return $incrementStatement ? '$ret && ' . $incrementStatement : '';
+    }
+
+    /**
+     * @param string $indent
+     *
+     * @return string
+     */
+    protected function getIncrementAggregationColumnStatement(string $indent = ''): string
+    {
+        $columnName = $this->behavior->aggregationColumnNameOnSource();
+        if (!$columnName) {
+            return '';
+        }
+        $phpColumnName = $this->behavior->getTable()->getColumn($columnName)->getPhpName();
+
+        return <<<EOT
+{$indent}\$this->set{$phpColumnName}((\$this->$columnName ?? 0) + 1);
+EOT;
+    }
+
+    /**
+     * @param \Propel\Generator\Builder\Om\ObjectBuilder $objectBuilder
+     *
+     * @return string
+     */
+    public function postSave(ObjectBuilder $objectBuilder)
+    {
+        return $this->getUpdateDataRowValueStatement();
+    }
+
+    /**
+     * @return string
+     */
+    protected function getUpdateDataRowValueStatement(): string
+    {
+        return <<<EOT
+\$this->update{$this->dataRowAttributeName}();
+EOT;
+    }
+
+    /**
+     * @param \Propel\Generator\Builder\Om\ObjectBuilder $objectBuilder
+     *
+     * @return string
+     */
+    public function postInsert(ObjectBuilder $objectBuilder)
+    {
+        $columns = $this->behavior->getAuditedColumnsOnInsert();
+        $columnsExpression = ($columns)
+            ? "[\n    '" . implode("',\n    '", $columns) . "'\n]"
+            : 'null';
+
+        return implode("\n", [
+            $this->getUpdateDataRowValueStatement(), // necessary for other postInsert
+            $this->buildCreateAuditStatements('insert', $objectBuilder, $columnsExpression, true, true, true),
+        ]);
+    }
+
+    /**
+     * @param \Propel\Generator\Builder\Om\ObjectBuilder $objectBuilder
+     *
+     * @return string
+     */
+    public function postDelete(ObjectBuilder $objectBuilder)
+    {
+        $columnsExpression = $objectBuilder->getTableMapClassName() . '::getFieldNames(TableMap::TYPE_COLNAME)';
+
+        return implode("\n", [
+            $this->buildCreateAuditStatements('delete', $objectBuilder, $columnsExpression, true, true, true),
+            $this->getIncrementAggregationColumnStatement(),
+        ]);
+    }
+
+    /**
+     * @param string $auditEvent 'insert', 'update' or 'delete'
+     * @param \Propel\Generator\Builder\Om\ObjectBuilder $objectBuilder
+     * @param string $columnsExpression
+     * @param bool $saveManually
+     * @param bool $useObjectValues
+     * @param bool $forceCreate
+     *
+     * @return string
+     */
+    public function buildCreateAuditStatements(
+        string $auditEvent,
+        ObjectBuilder $objectBuilder,
+        string $columnsExpression,
+        bool $saveManually,
+        bool $useObjectValues = false,
+        bool $forceCreate = false
+    ): string {
+        $forceSaveExpression = var_export($saveManually, true);
+        $useObjectValuesExpression = var_export($useObjectValues, true);
+        $forceCreateExpression = var_export($forceCreate, true);
+
+        return <<<EOT
+\$this->addNewAudit('$auditEvent', $columnsExpression, $forceSaveExpression, $useObjectValuesExpression, $forceCreateExpression);
+EOT;
+    }
+}
diff --git a/src/Propel/Generator/Behavior/Auditable/templates/auditObjectMethods.php b/src/Propel/Generator/Behavior/Auditable/templates/auditObjectMethods.php
new file mode 100644
index 000000000..2d52bdb4c
--- /dev/null
+++ b/src/Propel/Generator/Behavior/Auditable/templates/auditObjectMethods.php
@@ -0,0 +1,132 @@
+<?php
+    /**
+     * phpcs:ignoreFile
+     *
+     * Expected variables:
+     * 
+     * @var string $internalChangedValuesColumnPhpName
+     * @var string $restoredChangedValuesColumnPhpName
+     * @var string $auditEventColumnPhpName
+     * @var string $auditedAtColumnName
+     * @var string $auditObjectName
+     * @var string $auditIdColumnName
+     * @var array<\Propel\Generator\Model\Column> $syncedPkColumns
+     * @var string $relationToSourceName
+     * @var string $queryClassName
+     */
+?>
+/**
+ * @param <?= $auditObjectName ?> $audit1
+ * @param <?= $auditObjectName ?> $audit2
+ *
+ * @return int
+ */
+protected function compareSourcePk(<?= $auditObjectName ?> $audit1, <?= $auditObjectName ?> $audit2): int
+{
+<?php 
+    $comparisons = [];
+    foreach($syncedPkColumns as $pkColumn){
+        $comparatorPattern = $pkColumn->isNumericType() ? "%s - %s" : 'strcomp(%s, %s)';
+        $columnAccessor = 'get' . $pkColumn->getPhpName().'()';
+        $comparisons[] = sprintf($comparatorPattern, "\$audit2->$columnAccessor", "\$audit1->$columnAccessor");
+    }
+    $compareStatement = implode("\n    ?:", $comparisons);
+?>
+    return <?= $compareStatement ?>;
+}
+
+/**
+ * @param array<<?= $auditObjectName ?>> $audits
+ *
+ * @return array<array<<?= $auditObjectName ?>>>
+ */
+protected static function groupAuditsBySource(array $audits): array
+{
+    $groups = [];
+    foreach($audits as $audit){
+<?php 
+    $keyAccessors = array_map(fn($col) => '$audit->' . $col->getName(), $syncedPkColumns);
+    $keyGetter = count($keyAccessors) === 1 ? $keyAccessors[0] : ('md5(json_encode(' . implode(', ', $keyAccessors) . '))');
+?>
+        $key = <?= $keyGetter ?>;
+        $groups[$key] ?? ($groups[$key] = []);
+        $groups[$key][] = $audit;
+    }
+
+    return $groups;
+}
+
+/**
+ * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use.
+ *
+ * @return array
+ */
+public function get<?= $restoredChangedValuesColumnPhpName ?>(ConnectionInterface $con = null): array
+{
+    if (!$this->hasVirtualColumn('<?= $restoredChangedValuesColumnPhpName ?>')){
+<?php
+$chainedFilterStatements = implode('', array_map(fn($column) => "->filterBy{$column->getPhpName()}(\$this->{$column->getName()})", $syncedPkColumns));
+?>
+        $auditGroup = <?= $queryClassName ?>::create()<?= $chainedFilterStatements ?>->find($con)->toArrayCopy();
+        $this->restoreAudits($auditGroup);
+    }
+
+    return $this->getVirtualColumn('<?= $restoredChangedValuesColumnPhpName ?>');
+}
+
+/**
+ * Restores changed values of the given audit objects.
+ *
+ * Can process audits of different source objects.
+ *
+ * For correct results, the list has to include, for each given audit, all
+ * existing later audits.
+ *
+ * @param array<<?= $auditObjectName ?>> $listOfAudits
+ *
+ * @return array<array<<?= $auditObjectName ?>>> The processed input object,
+ *                                      grouped by source object id.  
+ */
+public static function restoreAudits(array $listOfAudits): array
+{
+    $groups = static::groupAuditsBySource($listOfAudits);
+    $auditRows = [];
+    foreach ($groups as $key => $audits){
+        if (!$audits) {
+            continue;
+        }
+        usort($audits, fn(<?= $auditObjectName ?> $audit1, <?= $auditObjectName ?> $audit2) => strcmp($audit2-><?= $auditedAtColumnName ?>, $audit1-><?= $auditedAtColumnName ?>));
+        $sourceObject = $audits[0]->get<?= $relationToSourceName ?>();
+        if (!$sourceObject && $audits[0]->get<?= $auditEventColumnPhpName ?>() !== 'delete'){
+            throw new \RuntimeException('Cannot retrieve current values of audited object - looks like it was deleted without writing an audit log? AuditId: '.$audits[0]-><?= $auditIdColumnName ?>);
+        } 
+        $laterRow = $sourceObject ? $sourceObject->getAuditedColumnsCurrentValues() : $audits[0]->get<?= $internalChangedValuesColumnPhpName ?>();
+        $auditRows[$key] = [];
+
+        foreach($audits as $audit){
+            $audit->setVirtualColumn('<?= $restoredChangedValuesColumnPhpName ?>', $audit->resolveEarlierSourceValues($laterRow));
+            $auditRows[$key][] = $audit;
+            $laterRow = array_merge($laterRow, $audit->get<?= $internalChangedValuesColumnPhpName ?>());
+        }
+    }
+
+    return $auditRows;
+}
+
+/**
+ * Resolve values actually changed in audit.
+ *
+ * Override for custom output.
+ *
+ * @param array $laterValues
+ *
+ * @return array
+ */
+protected function resolveEarlierSourceValues(array $laterValues): array
+{
+    $overriddenValues = $this->get<?= $internalChangedValuesColumnPhpName ?>();
+
+    return ($this->get<?= $auditEventColumnPhpName ?>() === 'insert') 
+        ? array_merge($overriddenValues ?? [], $laterValues) 
+        : array_intersect_key($laterValues, $overriddenValues );
+}
diff --git a/src/Propel/Generator/Behavior/Auditable/templates/sourceObjectMethods.php b/src/Propel/Generator/Behavior/Auditable/templates/sourceObjectMethods.php
new file mode 100644
index 000000000..b424ccff2
--- /dev/null
+++ b/src/Propel/Generator/Behavior/Auditable/templates/sourceObjectMethods.php
@@ -0,0 +1,167 @@
+<?php
+    /**
+     * phpcs:ignoreFile
+     *
+     * Expected variables:
+     * 
+     * @var array<array{column: \Propel\Generator\Model\Column, isOmited: bool}> $auditedFields
+     * @var \Propel\Generator\Builder\Om\ObjectBuilder $objectBuilder
+     * @var \Propel\Generator\Model\ForeignKey $fk
+     * @var \Propel\Generator\Model\Table $table
+     * @var string $dataRowAttributeName
+     * @var string $auditEventColumnPhpName
+     * @var string $internalChangedValuesColumnPhpName
+     * @var string $omitValue
+     * 
+     */
+
+    $auditObjectImportedClass = $objectBuilder->getClassNameFromTable($table);
+?>
+
+/**
+ * Set row values to current data.
+ */
+protected function update<?= $dataRowAttributeName ?>(): void
+{
+    $this-><?= $dataRowAttributeName ?> = $this->toArray(TableMap::TYPE_NUM, false);
+}
+
+/**
+ * @param string $auditEvent 'insert', 'update' or 'delete'
+ * @param array|null $selectedColumns Optional parameter to override audited columns.
+ * @param bool $forceSave Immediately save the audit after creation.
+ * @param bool $useCurrent Use current data instead of row values.
+ * @param bool $forceCreate Create audit even if there are no changes.
+ *
+ * @return void
+ */
+protected function addNewAudit(
+    string $auditEvent,
+    ?array $selectedColumns = null,
+    bool $forceSave = false,
+    bool $useCurrent = false,
+    bool $forceCreate = false
+): void
+{
+    $audit = $this->create<?= $table->getPhpName() ?>($auditEvent, $selectedColumns, $useCurrent, $forceCreate);
+    if (!$audit) {
+        return;
+    }
+    $this->add<?= $objectBuilder->getRefFKPhpNameAffix($fk, false) ?>($audit);
+    if ($forceSave){
+        $audit->save();
+    }
+}
+
+/**
+ * Create an audit for modified or specified columns. 
+ *
+ * @param string $auditEvent 'insert', 'update' or 'delete'
+ * @param array|null $selectedColumns Optional parameter to override audited columns.
+ * @param bool $useCurrent Use current data instead of row values.
+ * @param bool $forceCreate Create audit even if there are no changes.
+ *
+ * @return <?= $table->getPhpName() ?>|null 
+ */
+protected function create<?= $table->getPhpName() ?>(
+    string $auditEvent,
+    ?array $selectedColumns = null,
+    bool $useCurrent = false,
+    bool $forceCreate = false
+): ?<?= $table->getPhpName() ?>
+
+{
+    $auditData = $this->buildAuditChanges($selectedColumns, $useCurrent);
+    if (!$auditData && !$forceCreate) {
+        return null;
+    }
+    $audit = new <?= $objectBuilder->getClassNameFromTable($table) ?>();
+    $audit->set<?= $auditEventColumnPhpName ?>($auditEvent);
+    $audit->set<?= $internalChangedValuesColumnPhpName ?>($auditData);
+
+    return $audit;
+}
+
+/**
+ * @param string $auditEvent 'insert', 'update' or 'delete'
+ * Build list of changed column names and their old value.
+ *
+ * @param array|null $selectedColumns Optional parameter to override audited columns.
+ * @param bool $useCurrent Use current data instead of row values.
+ *
+ * @return array<string, mixed>
+ */
+protected function buildAuditChanges(?array $selectedColumns = null, $useCurrent = false): array
+{
+    if (!$useCurrent && $this-><?= $dataRowAttributeName ?> === null){
+        throw new \RuntimeException('Trying to create audit without row values.');
+    }
+
+    $overwrittenValues = [];
+    $columnKeys = $selectedColumns ?: array_keys($this->modifiedColumns);
+    $values = $useCurrent ?  $this->toArray(TableMap::TYPE_NUM, false) : $this-><?= $dataRowAttributeName ?>;
+    foreach ($columnKeys as $qualifiedColumnName) {
+        switch ($qualifiedColumnName) {
+<?php foreach ($auditedFields as $fieldData):
+    /** @var \Propel\Generator\Model\Column */
+    $column = $fieldData['column'];
+    $fieldIndex = $column->getPosition()-1 ;
+    $valueGetter = $fieldData['isOmited'] ? "'$omitValue'" : "\$values[$fieldIndex]";
+?>
+
+            case <?= $column->getFQConstantName() ?>:
+                $overwrittenValues['<?= $column->getName() ?>'] = $this->getAuditFieldValue($qualifiedColumnName, <?= $valueGetter ?>);
+
+                break;
+<?php endforeach ?>
+        }
+    }
+
+    return $overwrittenValues;
+}
+
+/**
+ * @return array
+ */
+public function getAuditedColumnsCurrentValues(): array
+{
+    $auditedColumns = <?= $objectBuilder->getTableMapClassName() ?>::getFieldNames(TableMap::TYPE_COLNAME);
+
+    return $this->buildAuditChanges($auditedColumns, true);
+}
+
+/**
+ * Determines column values in audits. Can be overridden to set custom values.
+ *
+ * @param string $qualifiedColumnName The column name as stored in the TableMap const (i.e. BookTableMap::COL_ID).
+ * @param mixed $defaultAuditValue The audit value according to configuration.
+ *
+ * @return mixed 
+ */
+protected function getAuditFieldValue(string $qualifiedColumnName, $defaultAuditValue)
+{
+    return $defaultAuditValue;
+}
+
+/**
+ * Load the complet audit with restored change values.
+ *
+ * @param ConnectionInterface|null $con
+ *
+ * @return ObjectCollection The audit objects ordered by audit
+ *                          date in descending order (latest change first).
+ */
+public function restoreAudit(?ConnectionInterface $con = null): ObjectCollection
+{
+    if (!$this->hasVirtualColumn('RestoredAudit')) {
+        $auditObjects = $this->get<?= $objectBuilder->getRefFKPhpNameAffix($fk, true) ?>($con);
+        $auditGroups = <?= $table->getPhpName() ?>::restoreAudits($auditObjects->getArrayCopy());
+        $restoredAudit = reset($auditGroups);
+        $auditObjects->exchangeArray($restoredAudit); // fixes order
+        $this->setVirtualColumn('RestoredAudit', $auditObjects);
+    }
+
+    return $this->getVirtualColumn('RestoredAudit');
+}
+
+// end auditable behavior
diff --git a/src/Propel/Generator/Behavior/Util/InsertCodeBehavior.php b/src/Propel/Generator/Behavior/Util/InsertCodeBehavior.php
index df238a38f..16e9be024 100644
--- a/src/Propel/Generator/Behavior/Util/InsertCodeBehavior.php
+++ b/src/Propel/Generator/Behavior/Util/InsertCodeBehavior.php
@@ -8,6 +8,7 @@
 
 namespace Propel\Generator\Behavior\Util;
 
+use InvalidArgumentException;
 use Propel\Generator\Builder\Om\ObjectBuilder;
 use Propel\Generator\Model\Behavior;
 use Propel\Generator\Model\Table;
@@ -99,6 +100,29 @@ public function objectCall(ObjectBuilder $objectBuilder): string
         return $this->resolveCode('objectCall', $objectBuilder);
     }
 
+    /**
+     * @see \Propel\Generator\Model\Behavior::objectFilter()
+     *
+     * @param string $script
+     * @param \Propel\Generator\Builder\Om\ObjectBuilder $objectBuilder
+     *
+     * @throws \InvalidArgumentException
+     *
+     * @return void
+     */
+    public function objectFilter(string &$script, ObjectBuilder $objectBuilder)
+    {
+        $fun = $this->codeForHooks['objectFilter'] ?? null;
+        if (!$fun) {
+            return;
+        }
+        if (!is_callable($fun)) {
+            throw new InvalidArgumentException("Value in 'objectFilter' has to be callable.");
+        }
+
+        $script = $fun($script, $objectBuilder);
+    }
+
     /**
      * @param \Propel\Generator\Builder\Om\ObjectBuilder $objectBuilder
      *
diff --git a/tests/Fixtures/bookstore/behavior-auditable-schema.xml b/tests/Fixtures/bookstore/behavior-auditable-schema.xml
new file mode 100644
index 000000000..b99b8ae3c
--- /dev/null
+++ b/tests/Fixtures/bookstore/behavior-auditable-schema.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
+<database name="bookstore-behavior" defaultIdMethod="native" package="behavior.auditable" namespace="\Propel\Tests\Generator\Behavior\Auditable">
+
+  <table name="source_with_default_audit">
+    <column name="id" required="true" primaryKey="true" autoIncrement="true" type="INTEGER"/>
+    <column name="regular_column" type="VARCHAR" size="42"/>
+    <column name="ignored_column" type="VARCHAR" size="42"/>
+    <column name="omited_column" type="VARCHAR" size="42"/>
+    <column name="omited_type_column" type="CLOB"/>
+
+    <behavior name="auditable">
+        <parameter name="ignore_fields" value="ignored_column"/>
+        <parameter name="omit_value_fields" value="omited_column"/>
+        <parameter name="omit_value_types" value="CLOB"/>
+        <parameter name="omit_value" value="got changed"/>
+    </behavior>
+  </table>
+
+  <table name="source_with_complex_audit">
+    <column name="id" required="true" primaryKey="true" autoIncrement="true" type="INTEGER"/>
+    <column name="regular_column" type="VARCHAR" size="42"/>
+    <column name="ignored_column" type="VARCHAR" size="42"/>
+    <column name="omited_column" type="VARCHAR" size="42"/>
+    <column name="omited_type_column" type="BLOB"/>
+
+    <behavior name="auditable">
+
+        <!-- renames -->
+        <parameter name="table_name" value="le_complex_audit"/>
+        <parameter name="synced_phpname" value="LeAuditComplique"/>
+        <parameter name="id_field_name" value="le_id"/>
+        <parameter name="audited_at_field_name" value="le_at"/>
+        <parameter name="audit_event_field_name" value="le_when"/>
+        <parameter name="changed_values_field_name" value="le_changes"/>
+        <parameter name="column_prefix" value="le_source_"/>
+
+        <!-- additional data -->
+        <parameter-list name="columns">
+            <parameter-list-item>
+                <parameter name="name" value="fk_to_source_id"/>
+                <parameter name="type" value="integer"/>
+            </parameter-list-item>
+        </parameter-list>
+        <parameter-list name="foreign_keys">
+            <parameter-list-item>
+                <parameter name="name" value="LeFk" />
+                <parameter name="localColumn" value="fk_to_source_id" />
+                <parameter name="foreignTable" value="source_with_complex_audit" />
+                <parameter name="foreignColumn" value="id" />
+                <parameter name="phpName" value="ManualFk" />
+                <parameter name="refPhpName" value="ManualFk" />
+            </parameter-list-item>
+        </parameter-list>
+        <parameter name="add_aggregation_to_source" value="number_of_audits"/>
+
+        <!-- ignores/omits -->
+        <parameter name="ignore_fields" value="ignored_column"/>
+        <parameter name="omit_value_fields" value="omited_column"/>
+        <parameter name="omit_value_types" value="BLOB"/>
+        <parameter name="omit_value" value="got changed"/>
+
+        <!-- behavior -->
+        <parameter name="audit_on_insert" value="id"/>
+        <parameter name="audit_on_delete" value=""/>
+        <parameter name="cascade_delete" value=""/>
+    </behavior>
+  </table>
+
+
+</database>
diff --git a/tests/Propel/Tests/Generator/Behavior/Auditable/AuditableBehaviorDeclarationTest.php b/tests/Propel/Tests/Generator/Behavior/Auditable/AuditableBehaviorDeclarationTest.php
new file mode 100644
index 000000000..d21f32144
--- /dev/null
+++ b/tests/Propel/Tests/Generator/Behavior/Auditable/AuditableBehaviorDeclarationTest.php
@@ -0,0 +1,142 @@
+<?php
+
+/*
+ *	$Id$
+ * This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @license MIT License
+ */
+
+/**
+ * MIT License. This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Propel\Tests\Generator\Behavior\Auditable;
+
+use Propel\Generator\Model\Column;
+use Propel\Generator\Model\PropelTypes;
+use Propel\Generator\Util\QuickBuilder;
+use Propel\Tests\TestCase;
+
+/**
+ */
+class AuditableBehaviorDeclarationTest extends TestCase
+{
+    /**
+     * @return void
+     */
+    public function testTableDefaults(): void
+    {
+        $schemaXml = <<<EOT
+        <database>
+            <table name="source_table">
+                <column name="int_col" type="INTEGER" primaryKey="true"/>
+
+                <behavior name="auditable"></behavior>
+            </table>
+        </database>
+EOT;
+        $builder = new QuickBuilder();
+        $builder->setSchema($schemaXml);
+
+        $database = $builder->getDatabase();
+        $table = $database->getTable('source_table_audit');
+        $this->assertNotNull($table, 'Audit table should have been created with expected name');
+        $fieldNames = array_map(fn(Column $col) => $col->getName(), $table->getColumns());
+        $expectedFieldNames = ['source_table_int_col', 'audit_id', 'audited_at', 'audit_event', 'internal_changed_values'];
+        $this->assertEquals($expectedFieldNames, $fieldNames);
+    }
+
+    /**
+     * @return void
+     */
+    public function testTableParameters(): void
+    {
+        $schemaXml = <<<EOT
+           <database>
+               <table name="source_table">
+                   <column name="int_col" type="INTEGER" primaryKey="true"/>
+   
+                   <behavior name="auditable">
+                        <parameter name="table_name" value="le_source_table_audit"/>
+                        <parameter name="id_field_name" value="le_id"/>
+                        <parameter name="audited_at_field_name" value="le_at"/>
+                        <parameter name="changed_values_field_name" value="le_changes"/>
+                        <parameter name="changed_values_field_type" value="CHAR"/>
+                        <parameter name="changed_values_field_size" value="2"/>
+                        <parameter name="column_prefix" value="source_"/>
+                        <parameter-list name="relation">
+                            <parameter-list-item>
+                                <parameter name="le_attribute" value="le_value"/>
+                            </parameter-list-item>
+                        </parameter-list>
+                   </behavior>
+               </table>
+           </database>
+   EOT;
+        $builder = new QuickBuilder();
+        $builder->setSchema($schemaXml);
+
+        $database = $builder->getDatabase();
+        $table = $database->getTable('le_source_table_audit');
+        $this->assertNotNull($table, 'Audit table should have been created with expected name');
+
+        $fieldNames = array_map(fn(Column $col) => $col->getName(), $table->getColumns());
+        $expectedFieldNames = ['source_int_col', 'le_id', 'le_at', 'audit_event', 'internal_le_changes'];
+        $this->assertEquals($expectedFieldNames, $fieldNames);
+
+        $changedValuesDomain = $table->getColumn('internal_le_changes')->getDomain();
+        $this->assertEquals(PropelTypes::CHAR, $changedValuesDomain->getType());
+        $this->assertEquals(2, $changedValuesDomain->getSize());
+
+        $relation = $table->getForeignKeys()[0];
+        $this->assertNotNull($relation);
+        $this->assertEquals('le_value', $relation->getAttribute('le_attribute'));
+    }
+
+    /**
+     * @return void
+     */
+    public function testSelectAuditedColumns(): void
+    {
+        $schemaXml = <<<EOT
+        <database>
+            <table name="table">
+                <column name="int_col" type="INTEGER" />
+                <column name="password" type="VARCHAR" />
+                <column name="blob_col" type="BLOB" />
+                <column name="changed_at" type="TIMESTAMP" />
+
+                <behavior name="auditable">
+                    <parameter name="ignore_fields" value="changed_at"/>
+                    <parameter name="omit_value_fields" value="password"/>
+                    <parameter name="omit_value_types" value="BLOB"/>
+                    <parameter name="omit_value" value="was changed"/>
+                </behavior>
+            </table>
+        </database>
+EOT;
+        $builder = new QuickBuilder();
+        $builder->setSchema($schemaXml);
+
+        $database = $builder->getDatabase();
+        $table = $database->getTable('table');
+        $behavior = $table->getBehavior('auditable');
+
+        $selected = $this->callMethod($behavior, 'selectAuditedFields');
+
+        $this->assertIsArray($selected);
+
+        $expected = [
+            ['column' => $table->getColumn('int_col'), 'isOmitted' => false],
+            ['column' => $table->getColumn('password'), 'isOmitted' => true],
+            ['column' => $table->getColumn('blob_col'), 'isOmitted' => true],
+        ];
+
+        $this->assertEqualsCanonicalizing($expected, $selected);
+    }
+}
diff --git a/tests/Propel/Tests/Generator/Behavior/Auditable/AuditableBehaviorTest.php b/tests/Propel/Tests/Generator/Behavior/Auditable/AuditableBehaviorTest.php
new file mode 100644
index 000000000..b46712537
--- /dev/null
+++ b/tests/Propel/Tests/Generator/Behavior/Auditable/AuditableBehaviorTest.php
@@ -0,0 +1,197 @@
+<?php
+
+/*
+ *	$Id$
+ * This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @license MIT License
+ */
+
+/**
+ * MIT License. This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Propel\Tests\Generator\Behavior\Auditable;
+
+use Propel\Tests\Generator\Behavior\Auditable\SourceWithComplexAudit;
+use Propel\Tests\Generator\Behavior\Auditable\SourceWithDefaultAudit;
+use Propel\Tests\TestCaseFixtures;
+
+/**
+ * @group database
+ */
+class AuditableBehaviorTest extends TestCaseFixtures
+{
+
+    /**
+     * @return void
+     */
+    public function testToArrayDoesNotExportInternalField(): void
+    {
+        $audit = new SourceWithDefaultAuditAudit();
+        $audit->setInternalChangedValues(['key' => 'val']);
+
+        $this->assertArrayNotHasKey('InternalChangedValues', $audit->toArray());
+    }
+
+    /**
+     * @return void
+     */
+    public function testDefaultAudits(): void
+    {
+        $auditableOperation = 0;
+        $source = AuditableObjectDataBuilder::createInitialSourceWithDefaultAudit();
+        $this->assertDefaultAuditMatchesSource($source, $auditableOperation++, 'insert', []);
+
+        AuditableObjectDataBuilder::updateDefaultColumns($source, 'update1');
+        $this->assertDefaultAuditMatchesSource($source, $auditableOperation++, 'update', [
+            'omited_column' => 'got changed',
+            'omited_type_column' => 'got changed',
+            'regular_column' => 'initial regular value',
+        ]);
+
+        AuditableObjectDataBuilder::updateDefaultColumns($source, 'update2', ['omited_column', 'omited_type_column']);
+        $this->assertDefaultAuditMatchesSource($source, $auditableOperation++, 'update', [
+            'regular_column' => 'update1 regular value',
+        ]);
+
+        $source->delete();
+        $this->assertDefaultAuditMatchesSource($source, $auditableOperation++, 'delete', [
+            'id' => $source->getId(),
+            'omited_column' => 'got changed',
+            'omited_type_column' => 'got changed',
+            'regular_column' => 'update2 regular value',
+        ]);
+    }
+
+    /**
+     * @return void
+     */
+    public function testComplexAudits(): void
+    {
+        $auditableOperation = 0;
+        $source = AuditableObjectDataBuilder::createInitialSourceWithComplexAudit();
+        $this->assertComplexAuditMatchesSource($source, $auditableOperation++, 'insert', []);
+
+        AuditableObjectDataBuilder::updateDefaultColumns($source, 'update1');
+        $this->assertComplexAuditMatchesSource($source, $auditableOperation++, 'update', [
+            'omited_column' => 'got changed',
+            'omited_type_column' => 'got changed',
+            'regular_column' => 'initial regular value',
+        ]);
+
+        AuditableObjectDataBuilder::updateDefaultColumns($source, 'update2', ['omited_column', 'omited_type_column']);
+        $this->assertComplexAuditMatchesSource($source, $auditableOperation++, 'update', [
+            'regular_column' => 'update1 regular value',
+        ]);
+
+        $source->delete();
+        $this->assertComplexAuditMatchesSource($source, $auditableOperation++, 'delete', [
+            'id' => $source->getId(),
+            'omited_column' => 'got changed',
+            'omited_type_column' => 'got changed',
+            'regular_column' => 'update2 regular value',
+        ]);
+    }
+
+    /**
+     * @return void
+     */
+    public function testRestoreAudit(): void
+    {
+        $source = AuditableObjectDataBuilder::createInitialSourceWithComplexAudit();
+        $sourceId = $source->getId();
+        AuditableObjectDataBuilder::updateDefaultColumns($source, 'update1');
+        AuditableObjectDataBuilder::updateDefaultColumns($source, 'update2', ['omited_column', 'omited_type_column']);
+        $source->delete();
+        $audit = $source->restoreAudit();
+        $changedValues = array_map(fn($audit) => $audit->getLeChanges(), $audit->getArrayCopy());
+
+        $expectedChanges = [
+            [
+                'id' => $sourceId,
+                'regular_column' => 'update2 regular value',
+                'omited_column' => 'got changed',
+                'omited_type_column' => 'got changed',
+            ],
+            [
+                'regular_column' => 'update2 regular value',
+            ],
+            [
+                'regular_column' => 'update1 regular value',
+                'omited_column' => 'got changed',
+                'omited_type_column' => 'got changed',
+            ],
+            [
+                'id' => $sourceId,
+                'regular_column' => 'initial regular value',
+                'omited_column' => 'got changed',
+                'omited_type_column' => 'got changed',
+            ]
+        ];
+
+        $this->assertSame($expectedChanges, $changedValues);
+    }
+
+    /**
+     * @param SourceWithDefaultAudit $source
+     * @param int $auditNumber
+     * @param string $event
+     * @param array $changedValues
+     * 
+     * @return void
+     */
+    public function assertDefaultAuditMatchesSource(SourceWithDefaultAudit $source, int $auditNumber, string $event, array $changedValues): void
+    {
+        $audits = $source->getSourceWithDefaultAuditAudits();
+        $this->assertCount($auditNumber + 1, $audits);
+        $audit = $audits[$auditNumber];
+        $audit->reload();
+        $expectedExport = [
+            'SourceWithDefaultAuditId' => $source->getId(),
+            'AuditId' => $audit->getAuditId(),
+            'AuditedAt' => $audit->getAuditedAt('Y-m-d H:i:s.u'),
+            'AuditEvent' => $event,
+        ];
+        $this->assertSame($expectedExport, $audit->toArray());
+        $this->assertNotNull($audit->getAuditedAt(), 'Audit date should not be null');
+
+        $this->assertEqualsCanonicalizing($changedValues, $audit->getInternalChangedValues());
+    }
+
+    /**
+     * @param SourceWithComplexAudit $source
+     * @param int $auditNumber
+     * @param string $event
+     * @param array $changedValues
+     * 
+     * @return void
+     */
+    public function assertComplexAuditMatchesSource(SourceWithComplexAudit $source, int $auditNumber, string $event, array $changedValues): void
+    {
+        if ($event !== 'delete') {
+            $source->reload();
+        }
+        $this->assertEquals($auditNumber + 1, $source->getNumberOfAudits());
+
+        $audits = $source->getLeAuditCompliquesRelatedByLeSourceId();
+        $this->assertCount($auditNumber + 1, $audits);
+        $audit = $audits[$auditNumber];
+        $audit->reload();
+
+        $expectedExport = [
+            'LeSourceId' => $source->getId(),
+            'LeId' => $audit->getLeId(),
+            'FkToSourceId' => null,
+            'LeAt' => $audit->getLeAt('Y-m-d H:i:s.u'),
+            'LeWhen' => $event,
+        ];
+        $this->assertSame($expectedExport, $audit->toArray());
+        $this->assertInstanceOf(\DateTime::class, $audit->getLeAt(), 'Audit date should not be null');
+        $this->assertEqualsCanonicalizing($changedValues, $audit->getInternalLeChanges());
+    }
+}
diff --git a/tests/Propel/Tests/Generator/Behavior/Auditable/AuditableObjectDataBuilder.php b/tests/Propel/Tests/Generator/Behavior/Auditable/AuditableObjectDataBuilder.php
new file mode 100644
index 000000000..a0ec8aeaa
--- /dev/null
+++ b/tests/Propel/Tests/Generator/Behavior/Auditable/AuditableObjectDataBuilder.php
@@ -0,0 +1,67 @@
+<?php
+
+/*
+ *	$Id$
+ * This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @license MIT License
+ */
+
+/**
+ * MIT License. This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Propel\Tests\Generator\Behavior\Auditable;
+
+use Propel\Tests\Generator\Behavior\Auditable\SourceWithDefaultAudit;
+
+/**
+ */
+class AuditableObjectDataBuilder
+{
+    /**
+     * @param string $updateId
+     * 
+     * @return SourceWithDefaultAudit
+     */
+    public static function createInitialSourceWithDefaultAudit(string $updateId = 'initial'): SourceWithDefaultAudit
+    {
+        $source = new SourceWithDefaultAudit();
+        static::updateDefaultColumns($source, 'initial');
+
+        return $source;
+    }
+
+    /**
+     * @param string $updateId
+     * 
+     * @return SourceWithComplexAudit
+     */
+    public static function createInitialSourceWithComplexAudit(string $updateId = 'initial'): SourceWithComplexAudit
+    {
+        $source = new SourceWithComplexAudit();
+        static::updateDefaultColumns($source, 'initial');
+
+        return $source;
+    }
+
+    /**
+     * @param SourceWithDefaultAudit|SourceWithComplexAudit $source
+     * @param string $updateId
+     * @param array $skipColumns
+     * 
+     * @return void
+     */
+    public static function updateDefaultColumns($source, string $updateId, array $skipColumns = []): void
+    {
+        in_array('regular_column', $skipColumns) || $source->setRegularColumn($updateId . ' regular value');
+        in_array('ignored_column', $skipColumns) || $source->setIgnoredColumn($updateId . ' ignored value');
+        in_array('omited_column', $skipColumns) || $source->setOmitedColumn($updateId . ' omited value');
+        in_array('omited_type_column', $skipColumns) || $source->setOmitedTypeColumn(fopen('data://text/plain,' . $updateId . ' omited type', 'r'));
+        $source->save();
+    }
+}