diff --git a/CHANGELOG.md b/CHANGELOG.md
index 495a07ea..a0715f83 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # OnionShare Changelog
 
+## 2.6.2
+
+* Security fix: Removes newlines from History item path
+* Security fix: Set a maximum length of 524288 characters for text messages in Receive mode
+* Security fix: Allows only specific ASCII characters for usernames and removes control characters
+* Security fix: Forcefully disconnect user from chat on `disconnect` event
+* Security fix: Handle username validation excpeptions to prevent silent joining
+
 ## 2.6.1
 
 * Release updates: Automate builds with CI, make just 64-bit Windows release, make a single universal2 release for both Intel and Apple Silicon macOS
diff --git a/cli/onionshare_cli/resources/version.txt b/cli/onionshare_cli/resources/version.txt
index 6a6a3d8e..097a15a2 100644
--- a/cli/onionshare_cli/resources/version.txt
+++ b/cli/onionshare_cli/resources/version.txt
@@ -1 +1 @@
-2.6.1
+2.6.2
diff --git a/cli/pyproject.toml b/cli/pyproject.toml
index e47f6496..5b8c3023 100644
--- a/cli/pyproject.toml
+++ b/cli/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "onionshare_cli"
-version = "2.6.1"
+version = "2.6.2"
 description = "OnionShare lets you securely and anonymously send and receive files. It works by starting a web server, making it accessible as a Tor onion service, and generating an unguessable web address so others can download files from you, or upload files to you. It does _not_ require setting up a separate server or using a third party file-sharing service."
 authors = ["Micah Lee <micah@micahflee.com>"]
 license = "GPLv3+"
diff --git a/desktop/org.onionshare.OnionShare.appdata.xml b/desktop/org.onionshare.OnionShare.appdata.xml
index f0e533bb..bff830db 100644
--- a/desktop/org.onionshare.OnionShare.appdata.xml
+++ b/desktop/org.onionshare.OnionShare.appdata.xml
@@ -24,6 +24,6 @@
     <update_contact>micah@micahflee.com</update_contact>
     <content_rating type="oars-1.1" />
     <releases>
-        <release type="development" date="2024-02-20" version="2.6.1" />
+        <release type="development" date="2024-03-18" version="2.6.2" />
     </releases>
 </component>
diff --git a/desktop/poetry.lock b/desktop/poetry.lock
index 47864c7d..5deffc58 100644
--- a/desktop/poetry.lock
+++ b/desktop/poetry.lock
@@ -1018,7 +1018,7 @@ files = [
 
 [[package]]
 name = "onionshare-cli"
-version = "2.6.1"
+version = "2.6.2"
 description = "OnionShare lets you securely and anonymously send and receive files. It works by starting a web server, making it accessible as a Tor onion service, and generating an unguessable web address so others can download files from you, or upload files to you. It does _not_ require setting up a separate server or using a third party file-sharing service."
 optional = false
 python-versions = ">=3.8,<3.12"
diff --git a/desktop/pyproject.toml b/desktop/pyproject.toml
index d5745eda..85a0c7dc 100644
--- a/desktop/pyproject.toml
+++ b/desktop/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "onionshare"
-version = "2.6.1"
+version = "2.6.2"
 description = "OnionShare lets you securely and anonymously send and receive files. It works by starting a web server, making it accessible as a Tor onion service, and generating an unguessable web address so others can download files from you, or upload files to you. It does _not_ require setting up a separate server or using a third party file-sharing service."
 authors = ["Micah Lee <micah@micahflee.com>"]
 license = "GPLv3+"
diff --git a/desktop/setup.py b/desktop/setup.py
index 7e947f51..24ed05a0 100644
--- a/desktop/setup.py
+++ b/desktop/setup.py
@@ -3,7 +3,7 @@
 import setuptools
 
 # The version must be hard-coded because Snapcraft won't have access to ../cli
-version = "2.6.1"
+version = "2.6.2"
 
 setuptools.setup(
     name="onionshare",
diff --git a/docs/source/conf.py b/docs/source/conf.py
index bd72f35b..6918c212 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -1,6 +1,6 @@
 project = "OnionShare"
 author = copyright = "Micah Lee, et al."
-version = release = "2.6.1"
+version = release = "2.6.2"
 
 extensions = ["sphinx_rtd_theme"]
 templates_path = ["_templates"]
@@ -25,7 +25,7 @@ languages = [
     ("Tiếng Việt", "vi"),  # Vietnamese
 ]
 
-versions = ["2.3", "2.3.1", "2.3.2", "2.3.3", "2.4", "2.5", "2.6", "2.6.1"]
+versions = ["2.3", "2.3.1", "2.3.2", "2.3.3", "2.4", "2.5", "2.6", "2.6.1", "2.6.2"]
 
 html_theme = "sphinx_rtd_theme"
 html_logo = "_static/logo.png"
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 1e8cd54d..38021251 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,6 +1,6 @@
 name: onionshare
 base: core22
-version: "2.6.1"
+version: "2.6.2"
 summary: Securely and anonymously share files, host websites, and chat using Tor
 description: |
   OnionShare lets you securely and anonymously send and receive files. It works by starting