diff --git a/.gitignore b/.gitignore
index ab8c4d0..e18ed29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@
 /hexchat-2.14.2.tar.xz
 /hexchat-2.14.3.tar.xz
 /hexchat-2.16.0.tar.xz
+/hexchat-2.16.1.tar.xz
diff --git a/.hexchat.metadata b/.hexchat.metadata
new file mode 100644
index 0000000..d7bf5be
--- /dev/null
+++ b/.hexchat.metadata
@@ -0,0 +1 @@
+16c407c580e0f86762f928c4893d43df186f1df5 hexchat-2.16.1.tar.xz
diff --git a/hexchat-Install-icons-as-io.github.Hexchat.patch b/hexchat-Install-icons-as-io.github.Hexchat.patch
deleted file mode 100644
index d8fb3a3..0000000
--- a/hexchat-Install-icons-as-io.github.Hexchat.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From dac8ace90cffef656b1292c8d91648cc722c28fe Mon Sep 17 00:00:00 2001
-From: Patrick Griffis <tingping@tingping.se>
-Date: Mon, 25 Oct 2021 15:02:22 -0500
-Subject: [PATCH] Install icons as io.github.Hexchat
-
-This matches our app-id as the desktop-file spec recommends.
-
-This also fixes a bug where our notifications referred to this new
-name already.
----
- data/icons/meson.build                    | 2 ++
- data/misc/io.github.Hexchat.desktop.in.in | 2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/data/icons/meson.build b/data/icons/meson.build
-index d7926e831259..710e0045f24b 100644
---- a/data/icons/meson.build
-+++ b/data/icons/meson.build
-@@ -1,9 +1,11 @@
- icondir = join_paths(get_option('datadir'), 'icons/hicolor')
- install_data(
-   'hexchat.png',
-+  rename: 'io.github.Hexchat.png',
-   install_dir: join_paths(icondir, '48x48/apps')
- )
- install_data(
-   'hexchat.svg',
-+  rename: 'io.github.Hexchat.svg',
-   install_dir: join_paths(icondir, 'scalable/apps')
- )
-diff --git a/data/misc/io.github.Hexchat.desktop.in.in b/data/misc/io.github.Hexchat.desktop.in.in
-index 7bf6a9a8110c..5e00ce8f2539 100644
---- a/data/misc/io.github.Hexchat.desktop.in.in
-+++ b/data/misc/io.github.Hexchat.desktop.in.in
-@@ -4,7 +4,7 @@ GenericName=IRC Client
- Comment=Chat with other people online
- Keywords=IM;Chat;
- Exec=@exec_command@
--Icon=hexchat
-+Icon=io.github.Hexchat
- Terminal=false
- Type=Application
- Categories=GTK;Network;IRCClient;
--- 
-2.41.0
-
diff --git a/hexchat.spec b/hexchat.spec
index c66ae57..bac8b07 100644
--- a/hexchat.spec
+++ b/hexchat.spec
@@ -2,15 +2,12 @@
 
 Summary:   A popular and easy to use graphical IRC (chat) client
 Name:      hexchat
-Version:   2.16.0
-Release:   2%{?dist}
+Version:   2.16.1
+Release:   1%{?dist}
 License:   GPLv2+
 URL:       https://hexchat.github.io
 Source:    https://dl.hexchat.net/hexchat/%{name}-%{version}.tar.xz
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=2051561
-Patch0:    hexchat-Install-icons-as-io.github.Hexchat.patch
-
 BuildRequires: gcc
 BuildRequires: meson
 BuildRequires: hicolor-icon-theme
@@ -42,10 +39,10 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 This package contains the development files for %{name}.
 
 %prep
-%autosetup -p1
+%autosetup
 
 %build
-%meson -Dwith-lua=lua
+%meson -Dwith-lua=lua %{?flatpak:-Ddbus-service-use-appid=true}
 %meson_build
 
 %install
@@ -68,14 +65,22 @@ This package contains the development files for %{name}.
 %{_datadir}/applications/%{app_id}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{app_id}.*
 %{_datadir}/metainfo/%{app_id}.appdata.xml
+%if 0%{?flatpak}
+%{_datadir}/dbus-1/services/%{app_id}.service
+%else
 %{_datadir}/dbus-1/services/org.hexchat.service.service
-%{_mandir}/man1/*.gz
+%endif
+%{_mandir}/man1/hexchat.1*
 
 %files devel
 %{_includedir}/hexchat-plugin.h
 %{_libdir}/pkgconfig/hexchat-plugin.pc
 
 %changelog
+* Thu Sep 28 2023 Debarshi Ray <rishi@fedoraproject.org> - 2.16.1-1
+- Update to 2.16.1
+Resolves: RHEL-766
+
 * Mon Jul 10 2023 Debarshi Ray <rishi@fedoraproject.org> - 2.16.0-2
 - Unbreak notification icon
 Resolves: #2051561
diff --git a/sources b/sources
index 7d39111..4db7d1d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (hexchat-2.16.0.tar.xz) = 4802f6efe0883f48d3d56ee949be1fc224b76a3c76956dcba3f913679e91424ba53c5c0d68bb4e0e790b16a08689111098958ead4c83c35cddf39855fe07c207
+SHA512 (hexchat-2.16.1.tar.xz) = 9e6baa30ec8c3ce4fb56e2c82625da63295040eaf93a542aec8a4a18a6a3c95d69d1d4ffabc952bcdcd7b754afef234b348f296143991fafd0550342db95ce0e