diff --git a/src/azure-cli-core/HISTORY.rst b/src/azure-cli-core/HISTORY.rst
index 872cc82e0da..dfe5a8d994c 100644
--- a/src/azure-cli-core/HISTORY.rst
+++ b/src/azure-cli-core/HISTORY.rst
@@ -3,6 +3,10 @@
 Release History
 ===============
 
+2.15.1
+++++++
+* Minor fixes
+
 2.15.0
 ++++++
 * Upgrade azure-mgmt-core to 1.2.1 (#15780)
@@ -310,8 +314,8 @@ Release History
 ++++++
 * Minor fixes
 
-2.0.36	
-++++++	
+2.0.36
+++++++
 * Minor fixes
 
 2.0.35
diff --git a/src/azure-cli-core/azure/cli/core/__init__.py b/src/azure-cli-core/azure/cli/core/__init__.py
index 9b753a170b1..11e406eaf30 100644
--- a/src/azure-cli-core/azure/cli/core/__init__.py
+++ b/src/azure-cli-core/azure/cli/core/__init__.py
@@ -6,7 +6,7 @@
 
 from __future__ import print_function
 
-__version__ = "2.15.0"
+__version__ = "2.15.1"
 
 import os
 import sys
diff --git a/src/azure-cli-core/setup.py b/src/azure-cli-core/setup.py
index 071494fd9f1..bac5566ad31 100644
--- a/src/azure-cli-core/setup.py
+++ b/src/azure-cli-core/setup.py
@@ -9,7 +9,7 @@
 from codecs import open
 from setuptools import setup
 
-VERSION = "2.15.0"
+VERSION = "2.15.1"
 
 # If we have source, validate that our version numbers match
 # This should prevent uploading releases with mismatched versions.
diff --git a/src/azure-cli/HISTORY.rst b/src/azure-cli/HISTORY.rst
index a838da77917..082451c9647 100644
--- a/src/azure-cli/HISTORY.rst
+++ b/src/azure-cli/HISTORY.rst
@@ -3,6 +3,13 @@
 Release History
 ===============
 
+2.15.1
+++++++
+
+**Profile**
+
+* Hotfix: Fix #15961: az login: UnboundLocalError: local variable 'token_entry' referenced before assignment
+
 2.15.0
 ++++++
 
@@ -502,7 +509,7 @@ Added Cluster commands and trusted_service_access_enabled parameter for Networkr
 **Storage**
 
 * `az storage blob list`: Support OR properties with new api version (#14832)
- 
+
 2.11.0
 ++++++
 
diff --git a/src/azure-cli/azure/cli/__main__.py b/src/azure-cli/azure/cli/__main__.py
index aadc298b770..5882963e0f0 100644
--- a/src/azure-cli/azure/cli/__main__.py
+++ b/src/azure-cli/azure/cli/__main__.py
@@ -17,7 +17,7 @@
 from knack.log import get_logger
 
 __author__ = "Microsoft Corporation <python@microsoft.com>"
-__version__ = "2.15.0"
+__version__ = "2.15.1"
 
 
 # A workaround for https://bugs.python.org/issue32502 (https://github.com/Azure/azure-cli/issues/5184)
diff --git a/src/azure-cli/requirements.py3.Darwin.txt b/src/azure-cli/requirements.py3.Darwin.txt
index f1bfdf92a9f..00157274f0f 100644
--- a/src/azure-cli/requirements.py3.Darwin.txt
+++ b/src/azure-cli/requirements.py3.Darwin.txt
@@ -5,8 +5,8 @@ argcomplete==1.11.1
 asn1crypto==0.24.0
 azure-appconfiguration==1.1.1
 azure-batch==9.0.0
-azure-cli==2.15.0
-azure-cli-core==2.15.0
+azure-cli==2.15.1
+azure-cli-core==2.15.1
 azure-cli-telemetry==1.0.6
 azure-common==1.1.22
 azure-cosmos==3.2.0
diff --git a/src/azure-cli/requirements.py3.Linux.txt b/src/azure-cli/requirements.py3.Linux.txt
index f1bfdf92a9f..00157274f0f 100644
--- a/src/azure-cli/requirements.py3.Linux.txt
+++ b/src/azure-cli/requirements.py3.Linux.txt
@@ -5,8 +5,8 @@ argcomplete==1.11.1
 asn1crypto==0.24.0
 azure-appconfiguration==1.1.1
 azure-batch==9.0.0
-azure-cli==2.15.0
-azure-cli-core==2.15.0
+azure-cli==2.15.1
+azure-cli-core==2.15.1
 azure-cli-telemetry==1.0.6
 azure-common==1.1.22
 azure-cosmos==3.2.0
diff --git a/src/azure-cli/requirements.py3.windows.txt b/src/azure-cli/requirements.py3.windows.txt
index 84b7b7c7391..8a867f0e7b2 100644
--- a/src/azure-cli/requirements.py3.windows.txt
+++ b/src/azure-cli/requirements.py3.windows.txt
@@ -5,8 +5,8 @@ argcomplete==1.11.1
 asn1crypto==0.24.0
 azure-appconfiguration==1.1.1
 azure-batch==9.0.0
-azure-cli==2.15.0
-azure-cli-core==2.15.0
+azure-cli==2.15.1
+azure-cli-core==2.15.1
 azure-cli-telemetry==1.0.6
 azure-common==1.1.22
 azure-cosmos==3.2.0
diff --git a/src/azure-cli/setup.py b/src/azure-cli/setup.py
index 827278085af..d6fe4dca033 100644
--- a/src/azure-cli/setup.py
+++ b/src/azure-cli/setup.py
@@ -18,7 +18,7 @@
     logger.warn("Wheel is not available, disabling bdist_wheel hook")
     cmdclass = {}
 
-VERSION = "2.15.0"
+VERSION = "2.15.1"
 # If we have source, validate that our version numbers match
 # This should prevent uploading releases with mismatched versions.
 try: