diff --git a/doc/Building.md b/doc/Building.md
index 1b9a897..88d8768 100644
--- a/doc/Building.md
+++ b/doc/Building.md
@@ -45,5 +45,5 @@ mvn clean tycho-versions:set-version -D newVersion=x.x.x-SNAPSHOT -P build-produ
 ## Release check list
 
 - [ ] Update [Changelog.md](Changelog.md)
-- [ ] Update [Installation.md](Installation.md.md)
+- [ ] Update [Installation.md](Installation.md)
 - [ ] Update [setup files](/releng/setup/).
diff --git a/doc/Changelog.md b/doc/Changelog.md
index 9a143b3..27ac46a 100644
--- a/doc/Changelog.md
+++ b/doc/Changelog.md
@@ -1,8 +1,18 @@
+## AsyncAPI Toolkit v0.6.1
+
+Minor release with minor fixes:
+
+* Add support for user/password authentication in MQTT servers.
+* Improve error notification on M2M transformation.
+* Fix wildcard computation expression, allowing parameters to appear at the beginning of a channel name.
+* Minor fix in package name calculation (skip empty segments).
+* Catch a few NPE when generating AsyncAPI specifications/code of incomplete models.
+
 ## AsyncAPI Toolkit v0.6.0
 
 Major release, with few but breaking changes:
 
-* Change the metaclass the Broker stereotype extends (Class vs Component) (breaking change!)
+* Change the metaclass the Broker stereotype extends (Class vs Component) (breaking change!).
 * Minor fixes in the New Project wizard window.
 * Improve documentation for the UML to AsyncAPI feature (i.e., _Industry 4.0_ support).
 
@@ -35,7 +45,6 @@ Major release with important changes:
 * Improve and refactor project documentation.
 * Many other code clean-ups and fixes.
 
-
 ## AsyncAPI Toolkit v0.4.6
 
 Minor bugfixes:
diff --git a/doc/Installation.md b/doc/Installation.md
index 1a47ddd..8f88adc 100644
--- a/doc/Installation.md
+++ b/doc/Installation.md
@@ -21,6 +21,7 @@ First, download the [Eclipse installer](https://www.eclipse.org/downloads/packag
 Setup links:
 
 * [AsyncAPI Toolkit (latest)](https://raw.githubusercontent.com/SOM-Research/asyncapi-toolkit/master/releng/setup/io.github.abelgomez.asyncapi.configuration.latest.setup)
+* [AsyncAPI Toolkit (0.6.1)](https://raw.githubusercontent.com/SOM-Research/asyncapi-toolkit/master/releng/setup/io.github.abelgomez.asyncapi.configuration.0.6.1.setup)
 * [AsyncAPI Toolkit (0.6.0)](https://raw.githubusercontent.com/SOM-Research/asyncapi-toolkit/master/releng/setup/io.github.abelgomez.asyncapi.configuration.0.6.0.setup)
 * [AsyncAPI Toolkit (0.5.0)](https://raw.githubusercontent.com/SOM-Research/asyncapi-toolkit/master/releng/setup/io.github.abelgomez.asyncapi.configuration.0.5.0.setup)
 
diff --git a/releng/setup/io.github.abelgomez.asyncapi.catalog.setup b/releng/setup/io.github.abelgomez.asyncapi.catalog.setup
index b829b90..66f8d4e 100644
--- a/releng/setup/io.github.abelgomez.asyncapi.catalog.setup
+++ b/releng/setup/io.github.abelgomez.asyncapi.catalog.setup
@@ -164,6 +164,52 @@
             url="https://som-research.github.io/asyncapi-toolkit/updates/0.6.0"/>
       </setupTask>
     </version>
+    <version
+        name="0.6.1"
+        label="0.6.1"
+        requiredJavaVersion="11">
+      <annotation
+          source="http://www.eclipse.org/oomph/setup/BrandingInfo">
+        <detail
+            key="siteURI">
+          <value>https://github.com/SOM-Research/asyncapi-toolkit/</value>
+        </detail>
+        <detail
+            key="shortcut">
+          <value>AsyncAPI Toolkit</value>
+        </detail>
+      </annotation>
+      <setupTask
+          xsi:type="setup.p2:P2Task"
+          label="Eclipse - 2022-03">
+        <repository
+            url="http://download.eclipse.org/releases/2022-03/"/>
+      </setupTask>
+      <setupTask
+          xsi:type="setup.p2:P2Task"
+          label="Eclipse Project Updates - 4.23">
+        <requirement
+            name="org.eclipse.platform.ide"/>
+        <repository
+            url="http://download.eclipse.org/eclipse/updates/4.23/"/>
+      </setupTask>
+      <setupTask
+          xsi:type="setup.p2:P2Task"
+          label="AsyncAPI Toolkit - 0.6.1">
+        <requirement
+            name="io.github.abelgomez.asyncapi.i40.feature.feature.group"/>
+        <requirement
+            name="io.github.abelgomez.asyncapi.i40.ui.feature.feature.group"/>
+        <requirement
+            name="io.github.abelgomez.asyncapi.feature.feature.group"/>
+        <requirement
+            name="io.github.abelgomez.asyncapi.ui.feature.feature.group"/>
+        <requirement
+            name="io.github.abelgomez.asyncapi.i40.profile.feature.feature.group"/>
+        <repository
+            url="https://som-research.github.io/asyncapi-toolkit/updates/0.6.1"/>
+      </setupTask>
+    </version>
     <description>Package suited to design AsyncAPI-based event-driven architectures based on the Eclipse Platform adding the AsyncAPI Toolkit, m2e, JDT, among other utilities.</description>
   </product>
   <description>The catalog of products available as packaged downloads for the AsyncAPI Toolkit.</description>
diff --git a/releng/setup/io.github.abelgomez.asyncapi.configuration.0.6.1.setup b/releng/setup/io.github.abelgomez.asyncapi.configuration.0.6.1.setup
new file mode 100644
index 0000000..d784d58
--- /dev/null
+++ b/releng/setup/io.github.abelgomez.asyncapi.configuration.0.6.1.setup
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<setup:Configuration
+    xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI"
+    xmlns:setup="http://www.eclipse.org/oomph/setup/1.0"
+    label="AsyncAPI Toolkit Installation Configuration">
+  <installation
+      name="io.github.abelgomez.asyncapi.installation"
+      label="AsyncAPI Toolkit Installation">
+    <productVersion
+        href="io.github.abelgomez.asyncapi.catalog.setup#//@products[name='asyncapi-toolkit']/@versions[name='0.6.1']"/>
+    <description>AsyncAPI Toolkit Installation.</description>
+  </installation>
+  <description>The AsyncAPI Toolkit Configuration allows installing the AsyncAPI Toolkit.</description>
+</setup:Configuration>