diff --git a/.gitignore b/.gitignore
index f0629db..f41d3e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/hexchat-2.16.0.tar.xz
+SOURCES/hexchat-2.16.1.tar.xz
diff --git a/.hexchat.metadata b/.hexchat.metadata
index c712ff2..c6187a5 100644
--- a/.hexchat.metadata
+++ b/.hexchat.metadata
@@ -1 +1 @@
-9867719f068ae867b3ca790dcf15ef3df83c7148 SOURCES/hexchat-2.16.0.tar.xz
+16c407c580e0f86762f928c4893d43df186f1df5 SOURCES/hexchat-2.16.1.tar.xz
diff --git a/SPECS/hexchat.spec b/SPECS/hexchat.spec
index 4d14ed3..bac8b07 100644
--- a/SPECS/hexchat.spec
+++ b/SPECS/hexchat.spec
@@ -2,7 +2,7 @@
 
 Summary:   A popular and easy to use graphical IRC (chat) client
 Name:      hexchat
-Version:   2.16.0
+Version:   2.16.1
 Release:   1%{?dist}
 License:   GPLv2+
 URL:       https://hexchat.github.io
@@ -39,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
@@ -63,16 +63,28 @@ This package contains the development files for %{name}.
 %{_libdir}/hexchat/plugins/python.so
 %{_libdir}/hexchat/python
 %{_datadir}/applications/%{app_id}.desktop
-%{_datadir}/icons/hicolor/*/apps/%{name}.*
+%{_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
+
 * Mon Dec 13 2021 Debarshi Ray <rishi@fedoraproject.org> - 2.16.0-1
 - Update to 2.16.0
 Resolves: #1965883