diff --git a/CHANGELOG.md b/CHANGELOG.md
index a3e6feaf1e577f223445c609ce024064b3ac69cf..e670b2893a72ab99472834001490a9f2fb8b7032 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -38,7 +38,6 @@
 Release
 =======
 
-
 Version 23.x.x
 --------------
 
@@ -53,17 +52,34 @@ Features
 Bug Fixes
 ^^^^^^^^^
 
-Version 23.6.0
+Version 23.6.1
 --------------
 
-Date: 09.06.2023
+Date: 16.06.2023
 
 Notes
 ^^^^^
 
+* QFQ is Typo3 V11 compatible
+
+Bug Fixes
+^^^^^^^^^
+
+* #16381 / Form title dynamic update broken.
+* #16392 / Reevaluate sanitize class for each store.
+* Fix db column enum dropdown 'data truncated'
+* DB Update 'alter index' pre check if exists
+* FE: Upload - fix undefined index.
+
+Version 23.6.0
+--------------
+
+Date: 09.06.2023
+
 Features
 ^^^^^^^^
 
+* Typo3 V11 compatible
 * #9579 / Multiform with Process Row.
 * #15770 / httpOrigin: Parameter missing in QFQ Config.
 * #16285 / PHP V8 Migration.
@@ -289,9 +305,9 @@ Notes
   per QFQ installation and/or per form.
 * Subrecord:
 
-    * Dynamically computed 'new' button in subrecord: FE.parameter.new. Use regular `... AS _link` syntax.
-    * Per row customizeable edit and delete button. Use special column name `_rowEdit` and `_rowDelete`. Use
-      regular `... AS _link` syntax.
+  * Dynamically computed 'new' button in subrecord: FE.parameter.new. Use regular `... AS _link` syntax.
+  * Per row customizeable edit and delete button. Use special column name `_rowEdit` and `_rowDelete`. Use
+    regular `... AS _link` syntax.
 
 * Link/Tablesorter: New link qualifier `|Y:...` which is invisible to the user, but will be respected by tablesorter and
   filter.
@@ -316,6 +332,7 @@ Features
 * Fix undefined index in SendMail.php. Show message 'forceSmtpSender is active' in catch all mail. Skip forcing sender
   address in redirectAll mode.
 
+
 Bug Fixes
 ^^^^^^^^^
 
@@ -450,6 +467,7 @@ T3 extension 'UZH_CD' should be updated to latest version >=22.09.18!
 Attention: since 22.09.07 UZH_CD includes all JS/CSS (exception: fabric). Remove all QFQ standard JS/CSS includes
 like datetimepicker, codemirror, ... from your typoscript template(s).
 
+
 Features
 ^^^^^^^^
 
@@ -527,6 +545,7 @@ Features
 * FormEditor: Column fe.mode shows now fe.modeSql by default. If empty, fe.mode will be shown.
 * QFQ_Encrypt_Decrypt - pre version - not finalized.
 
+
 Bug Fixes
 ^^^^^^^^^
 
@@ -3641,11 +3660,10 @@ Changes
 
 * Table `FormElement`:
 
-    * Modified column: `checkType` - new value `numerical`.
+  * Modified column: `checkType` - new value `numerical`.
 
-      ALTER TABLE FormElement MODIFY COLUMN checkType ENUM('alnumx','digit','numerical','email','min|max','min|max
-      date',
-      'pattern','allbut','all') NOT NULL DEFAULT 'alnumx'
+    ALTER TABLE FormElement MODIFY COLUMN checkType ENUM('alnumx','digit','numerical','email','min|max','min|max date',
+    'pattern','allbut','all') NOT NULL DEFAULT 'alnumx'
 
 * Example Report for `forms` extended by a delete button per row.
 
@@ -3692,22 +3710,22 @@ Changes
 ^^^^^^^
 
 * Table 'FormElement'
-    * New column: rowLabelInputNote:
+  * New column: rowLabelInputNote:
 
-      ALTER TABLE  `FormElement` ADD `rowLabelInputNote` set('row','label','/label','input','/input','note','/note','
-      /row')
-      NOT NULL DEFAULT 'row,label,/label,input,/input,note,/note,/row' AFTER  `bsNoteColumns` ;
+    ALTER TABLE  `FormElement` ADD `rowLabelInputNote` set('row','label','/label','input','/input','note','/note','
+    /row')
+    NOT NULL DEFAULT 'row,label,/label,input,/input,note,/note,/row' AFTER  `bsNoteColumns` ;
 
-    * Modified column: 'type' - new value 'templateGroup':
+  * Modified column: 'type' - new value 'templateGroup':
 
-      ALTER TABLE  `FormElement` CHANGE  `type`  `type` ENUM(  'checkbox',  'date',  'datetime',  'dateJQW',  '
-      datetimeJQW',  'extra',
-      'gridJQW',  'text',  'editor',  'time',  'note',  'password',  'radio',  'select',  'subrecord',  'upload',  '
-      fieldset', 'pill',
-      'templateGroup',  'beforeLoad',  'beforeSave',  'beforeInsert',  'beforeUpdate',  'beforeDelete',  'afterLoad',  '
-      afterSave',
-      'afterInsert',  'afterUpdate',  'afterDelete',  'sendMail' ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL
-      DEFAULT  'text'
+    ALTER TABLE  `FormElement` CHANGE  `type`  `type` ENUM(  'checkbox',  'date',  'datetime',  'dateJQW',  '
+    datetimeJQW',  'extra',
+    'gridJQW',  'text',  'editor',  'time',  'note',  'password',  'radio',  'select',  'subrecord',  'upload',  '
+    fieldset', 'pill',
+    'templateGroup',  'beforeLoad',  'beforeSave',  'beforeInsert',  'beforeUpdate',  'beforeDelete',  'afterLoad',  '
+    afterSave',
+    'afterInsert',  'afterUpdate',  'afterDelete',  'sendMail' ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL
+    DEFAULT  'text'
 
 * formEditor.sql: Added HTML 'placeholder' in FormEditor for bs*Columns.
 
@@ -3788,9 +3806,9 @@ Bug fixes
 * Skip unwanted parameter expansion during save.
 * Fixed bug with uninitialized FE_SLAVE_ID.
 * formEditor.sql:
-    * The defintion as 'editor' (not text) for FormElement 'note' has been lost - reinserted.
-    * Fixed problem while playing SQL query - deleting old FormElements of Formeditor deleted also FormElements of other
-      forms.
+  * The defintion as 'editor' (not text) for FormElement 'note' has been lost - reinserted.
+  * Fixed problem while playing SQL query - deleting old FormElements of Formeditor deleted also FormElements of other
+    forms.
 * #3066 / help-text with-error - CSS class 'hidden' will be rendered by default (as long there is no error).
 * Labels are skipped, if FormElement.bsLabelColumns=0.
 * Respect attribute `data-class-on-change` on save buttons.
diff --git a/Documentation-develop/NewVersion.md b/Documentation-develop/NewVersion.md
index bb1407f8173505e7b55909f8b4d72a545d8da801..7d82583afbc9e0101ee7e0bc78244baa6e7202d9 100644
--- a/Documentation-develop/NewVersion.md
+++ b/Documentation-develop/NewVersion.md
@@ -44,7 +44,7 @@ Neue Versionsnummer
    **Achtung**: die Release Minor darf KEINE fuehrenden Nullen enthalten!!! Ansonsten funktioniert die Verteilung vie
    TER nicht.
 
-   **Auto**: ./setVersion.sh 23.6.0
+   **Auto**: ./setVersion.sh 23.6.1
 
    Manuell:
 
@@ -56,7 +56,7 @@ Neue Versionsnummer
 
     * **Commit & Push** to develop branch:
 
-   New version v23.6.0
+   New version v23.6.1
 
 6)
     * Merge 'Develop' to **Master**: git.math.uzh.ch > QFQ > Merge Requests > New merge request > 'Develop >> Master'
@@ -66,10 +66,10 @@ Neue Versionsnummer
 
     * Neuen tag via Browser auf dem **master** branch setzen: git.math.uzh.ch > QFQ > Repository > Tags > New tag
 
-   Tag: v23.6.0
+   Tag: v23.6.1
 
    # Den tag mit diesem Command zu setzen scheint den Build Prozess nicht zu trigger.
-   git tag -a v23.6.0 -m 'New version v23.6.0' git push
+   git tag -a v23.6.1 -m 'New version v23.6.1' git push
 
 
 7) **Merge 'master' into 'develop'**
diff --git a/Documentation/Release.rst b/Documentation/Release.rst
index 0e6c1e35a2a7112b7532407d9e36bff1b12fa04b..50b3bb9a95d95f4dc58e166608136dd3bcff0cf9 100644
--- a/Documentation/Release.rst
+++ b/Documentation/Release.rst
@@ -38,7 +38,6 @@
 Release
 =======
 
-
 Version 23.x.x
 --------------
 
@@ -53,14 +52,30 @@ Features
 Bug Fixes
 ^^^^^^^^^
 
-Version 23.6.0
+Version 23.6.1
 --------------
 
-Date: 09.06.2023
+Date: 16.06.2023
 
 Notes
 ^^^^^
 
+* QFQ is Typo3 V11 compatible
+
+Bug Fixes
+^^^^^^^^^
+
+* #16381 / Form title dynamic update broken.
+* #16392 / Reevaluate sanitize class for each store.
+* Fix db column enum dropdown 'data truncated'
+* DB Update 'alter index' pre check if exists
+* FE: Upload - fix undefined index.
+
+Version 23.6.0
+--------------
+
+Date: 09.06.2023
+
 Features
 ^^^^^^^^
 
diff --git a/Documentation/Settings.cfg b/Documentation/Settings.cfg
index 5ea1c19f7c856f1d6a07e199ba790c45e1e739c3..9f27a0e4feafab61db2fd66f6071da7af8bf2165 100644
--- a/Documentation/Settings.cfg
+++ b/Documentation/Settings.cfg
@@ -22,7 +22,7 @@
 
 project = QFQ - Quick Form Query
 version = 23.6
-release = 23.6.0
+release = 23.6.1
 t3author = Carsten Rose
 copyright = since 2017 by the author
 
diff --git a/Documentation/conf.py b/Documentation/conf.py
index 7018059d8b700bb670165183a2db04cf0c0370eb..8570936708ec526901b261de4b34db8222741eed 100644
--- a/Documentation/conf.py
+++ b/Documentation/conf.py
@@ -64,7 +64,7 @@ author = 'Carsten Rose, Benjamin Baer'
 # The short X.Y version.
 version = '23.6'
 # The full version, including alpha/beta/rc tags.
-release = '23.6.0'
+release = '23.6.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/extension/RELEASE.txt b/extension/RELEASE.txt
index 339f08639728def3da4bf71e889cc9b6195fa0a9..50b3bb9a95d95f4dc58e166608136dd3bcff0cf9 100644
--- a/extension/RELEASE.txt
+++ b/extension/RELEASE.txt
@@ -38,7 +38,6 @@
 Release
 =======
 
-
 Version 23.x.x
 --------------
 
@@ -53,17 +52,34 @@ Features
 Bug Fixes
 ^^^^^^^^^
 
-Version 23.6.0
+Version 23.6.1
 --------------
 
-Date: 09.06.2023
+Date: 16.06.2023
 
 Notes
 ^^^^^
 
+* QFQ is Typo3 V11 compatible
+
+Bug Fixes
+^^^^^^^^^
+
+* #16381 / Form title dynamic update broken.
+* #16392 / Reevaluate sanitize class for each store.
+* Fix db column enum dropdown 'data truncated'
+* DB Update 'alter index' pre check if exists
+* FE: Upload - fix undefined index.
+
+Version 23.6.0
+--------------
+
+Date: 09.06.2023
+
 Features
 ^^^^^^^^
 
+* Typo3 V11 compatible
 * #9579 / Multiform with Process Row.
 * #15770 / httpOrigin: Parameter missing in QFQ Config.
 * #16285 / PHP V8 Migration.
diff --git a/extension/ext_emconf.php b/extension/ext_emconf.php
index 0af66ef4205e2177adcf5c31ebc56c7aac37d5d5..165ae8fee1452f5a4339c0e3f17cdcc5b537ea0b 100644
--- a/extension/ext_emconf.php
+++ b/extension/ext_emconf.php
@@ -12,7 +12,7 @@ $EM_CONF['qfq'] = array(
     'dependencies' => 'fluid,extbase',
     'clearcacheonload' => true,
     'state' => 'stable',
-    'version' => '23.6.0',
+    'version' => '23.6.1',
     'constraints' => [
         'depends' => [
             'typo3' => '8.0.0-11.9.99',
diff --git a/version b/version
index 0373daaf186441887ab873f590a28917560f83e0..5af34458a2d507a6545eaca985bb8cc0546fc074 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-23.6.0
+23.6.1