diff --git a/docs/source/conf.py b/docs/source/conf.py
index 16550bf2..3cfbde40 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -56,7 +56,7 @@ copyright = u'2017, Mike McLean, Mike B, Dennis Gilmore, Mathieu Bridon, Ian McL
# The short X.Y version.
version = '1.21'
# The full version, including alpha/beta/rc tags.
-release = '1.21.0'
+release = '1.21.1'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/docs/source/release_notes/release_notes.rst b/docs/source/release_notes/release_notes.rst
index d7bf613c..1740c0fd 100644
--- a/docs/source/release_notes/release_notes.rst
+++ b/docs/source/release_notes/release_notes.rst
@@ -5,6 +5,7 @@ Release Notes
.. toctree::
:maxdepth: 1
+ release_notes_1.21.1
release_notes_1.21
release_notes_1.20.1
release_notes_1.20
diff --git a/docs/source/release_notes/release_notes_1.21.1.rst b/docs/source/release_notes/release_notes_1.21.1.rst
new file mode 100644
index 00000000..3b7181fe
--- /dev/null
+++ b/docs/source/release_notes/release_notes_1.21.1.rst
@@ -0,0 +1,138 @@
+Koji 1.21.1 Release notes
+=========================
+
+All changes can be found at `pagure `_.
+Most important changes are listed here.
+
+Migrating from Koji 1.21
+------------------------
+
+No special actions are needed.
+
+Security Fixes
+--------------
+None
+
+Client Changes
+--------------
+
+**Don't use listTagged(tag, *) for untag-build**
+
+| PR: https://pagure.io/koji/pull-request/2038
+
+Simple change which speeds up ``untag-build`` call.
+
+**Fix list-signed --tag memory issues**
+
+| PR: https://pagure.io/koji/pull-request/2103
+
+Another performance improvement - rpms are filtered on hub's side on client's.
+
+**Fix variable name**
+
+| PR: https://pagure.io/koji/pull-request/2224
+
+Koji buildinfo could have failed on missing content generator fiels.
+
+**Fix un/lock-tag permission handling**
+
+| PR: https://pagure.io/koji/pull-request/2223
+
+Bug caused unlock-tag to fail on missing permission for admin.
+
+Library changes
+---------------
+
+**don't decode signature headers**
+
+| PR: https://pagure.io/koji/pull-request/2268
+
+Some rpm signature headers were not handled properly.
+
+Hub Changes
+-----------
+
+**Admin can force tag now**
+
+| PR: https://pagure.io/koji/pull-request/2203
+
+Previously admin cannot force policy for tagging. It is no more true.
+
+Utilities Changes
+-----------------
+
+Garbage Collector
+.................
+
+**fix query order**
+
+| PR: https://pagure.io/koji/pull-request/2279
+
+New ``queryHistory`` method doesn't sort output, so sorting on client side is
+needed. It is returned in DB preferred order which seems to work for PG, but
+better safe than sorry.
+
+**koji-gc: various typos in maven path**
+
+| PR: https://pagure.io/koji/pull-request/2153
+
+This is the important regression fix for bug which caused koji-gc to fail in
+many cases.
+
+**koji-gc: test existence of trashcan tag**
+
+| PR: https://pagure.io/koji/pull-request/2211
+
+We assumed that ``trashcan`` tag exists. If it is not the case GC will notice it
+relatively late. This is additional check during the start.
+
+Kojira
+......
+
+**kojira: use cached getTag for external repos**
+
+| PR: https://pagure.io/koji/pull-request/2157
+
+Use cached values for external repos checks.
+
+Documentation Changes
+---------------------
+
+**Links to copr builds**
+
+| PR: https://pagure.io/koji/pull-request/2248
+
+
+**Fix sidetag enablement typo**
+
+| PR: https://pagure.io/koji/pull-request/2178
+
+
+**Document removeExternalRepoFromTag arguments**
+
+| PR: https://pagure.io/koji/pull-request/2174
+
+
+**Extend docs for --before/--after options**
+
+| PR: https://pagure.io/koji/pull-request/2245
+
+
+**API docs**
+
+| PR: https://pagure.io/koji/pull-request/2241
+| PR: https://pagure.io/koji/pull-request/2242
+
+
+**Document addExternalRepoToTag arguments**
+
+| PR: https://pagure.io/koji/pull-request/2158
+
+
+**Remove obsoleted note**
+
+| PR: https://pagure.io/koji/pull-request/2194
+
+**Update for mod_auth_gssapi configuration**
+
+| PR: https://pagure.io/koji/pull-request/2141
diff --git a/koji.spec b/koji.spec
index 96d74120..a6a1cdb5 100644
--- a/koji.spec
+++ b/koji.spec
@@ -81,7 +81,7 @@
%define release %{baserelease}
%endif
Name: koji
-Version: 1.21.0
+Version: 1.21.1
Release: %{release}%{?dist}
License: LGPLv2 and GPLv2+
# the included arch lib from yum's rpmUtils is GPLv2+
@@ -727,6 +727,30 @@ fi
%endif
%changelog
+* Wed Jun 03 2020 Tomas Kopecek - 1.21.1-1
+ - PR#2279: koji-gc: fix query order
+ - PR#2038: Don't use listTagged(tag, *) for untag-build
+ - PR#2245: cli: extend docs for --before/--after options
+ - PR#2103: fix list-signed --tag memory issues
+ - PR#2241: hub: API docs
+ - PR#2242: hub: additional API docs
+ - PR#2136: replace logging.warn with warning
+ - PR#2141: kojiweb: update for mod_auth_gssapi configuration
+ - PR#2153: koji-gc: various typos in maven path
+ - PR#2157: kojira: use cached getTag for external repos
+ - PR#2158: hub: document addExternalRepoToTag arguments
+ - PR#2194: remove obsoleted note
+ - PR#2211: koji-gc: test existence of trashcan tag
+ - PR#2203: hub: admin can't force tag now
+ - PR#2224: cli: fix variable name
+ - PR#2223: cli: fix un/lock-tag permission handling
+ - PR#2268: don't decode signature headers
+ - PR#2248: doc: links to copr builds
+ - PR#2178: docs: Fix sidetag enablement typo
+ - PR#2174: hub: document removeExternalRepoFromTag arguments
+ - fix docs
+ - missing file from 1.21 docs
+
* Tue Apr 14 2020 Tomas Kopecek - 1.21-1
- PR#2057: update docs on httpd configuration
- PR#1385: Add --no-delete option to clone-tag
diff --git a/setup.py b/setup.py
index 23047fd3..529a573f 100644
--- a/setup.py
+++ b/setup.py
@@ -36,7 +36,7 @@ def get_install_requires():
setup(
name="koji",
- version="1.21.0",
+ version="1.21.1",
description=("Koji is a system for building and tracking RPMS. The base"
" package contains shared libraries and the command-line"
" interface."),