diff --git a/.gitignore b/.gitignore
index 538e9e8..a0cf1da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 hexedit-1.2.12.src.tgz
 /hexedit-1.2.13.src.tgz
 /1.5.tar.gz
+/hexedit-1.6.tar.gz
diff --git a/hexedit-1.6-fix-lsm.patch b/hexedit-1.6-fix-lsm.patch
new file mode 100644
index 0000000..06453ec
--- /dev/null
+++ b/hexedit-1.6-fix-lsm.patch
@@ -0,0 +1,47 @@
+Author:Filip Januš <fjanus@redhat.com>
+This patch fixs inconsistency between filename and configure.ac
+
+diff -ur hexedit-1.6.old/configure.ac hexedit-1.6/configure.ac
+--- hexedit-1.6.old/configure.ac	2022-04-22 09:06:10.000000000 +0100
++++ hexedit-1.6/configure.ac	2022-05-02 22:30:54.942894809 +0100
+@@ -15,7 +15,7 @@
+ VERSION=TheVERSION
+ INCL=hexedit.h
+ SRCS="hexedit.c display.c mark.c page.c file.c interact.c misc.c search.c"
+-OTHER="COPYING Changes TODO install-sh configure config.h.in hexedit.1 hexedit-TheVERSION.lsm Makefile.in configure.ac Makefile-build.in"
++OTHER="COPYING Changes TODO install-sh configure config.h.in hexedit.1 hexedit.lsm Makefile.in configure.ac Makefile-build.in"
+ AC_SUBST(PRODUCT)
+ AC_SUBST(VERSION)
+ AC_SUBST(INCL)
+@@ -74,5 +74,5 @@
+ #endif
+ )
+ 
+-AC_CONFIG_FILES([Makefile Makefile-build hexedit.1])
++AC_CONFIG_FILES([Makefile Makefile-build hexedit.1 hexedit.lsm])
+ AC_OUTPUT
+Only in hexedit-1.6: configure.ac~
+Only in hexedit-1.6: configure.ac.orig
+Only in hexedit-1.6: configure.ac.rej
+diff -ur hexedit-1.6.old/hexedit.lsm.in hexedit-1.6/hexedit.lsm.in
+--- hexedit-1.6.old/hexedit.lsm.in	2022-04-22 09:06:10.000000000 +0100
++++ hexedit-1.6/hexedit.lsm.in	2022-05-02 22:30:07.618550082 +0100
+@@ -1,6 +1,6 @@
+ Begin3
+ Title:          hexedit
+-Version:        TheVERSION
++Version:        @VERSION@
+ Entered-date:   10SEP98
+ Description: 	view and edit files in hexadecimal or in ASCII.
+ 		hexedit shows a file both in ASCII and in hexadecimal. 
+@@ -13,8 +13,8 @@
+ Author:         pixel@rigaux.org (Pixel)
+ Maintained-by:  pixel@rigaux.org (Pixel)
+ Primary-site:   sunsite.unc.edu /pub/Linux/utils/file/hex
+-                39kB hexedit-VERSION.src.tgz
+-		14kB hexedit-VERSION.bin.i386.dynamic.tgz
++                39kB hexedit-@VERSION@.src.tgz
++		14kB hexedit-@VERSION@.bin.i386.dynamic.tgz
+ Original-site:  rigaux.org /
+ Platforms:      Linux Unix SunOS Solaris SGI curses
+ Copying-policy: GPL
diff --git a/hexedit.spec b/hexedit.spec
index 7021656..24216c2 100644
--- a/hexedit.spec
+++ b/hexedit.spec
@@ -1,15 +1,18 @@
+%global forgeurl https://github.com/pixel/hexedit
+
+Version: 1.6
+%forgemeta
+
 Summary: A hexadecimal file viewer and editor
 Name: hexedit
-Version: 1.5
-Release: 3%{?dist}
+Release: 1%{?dist}
 License: GPLv2+
-
 URL: http://rigaux.org/hexedit.html
-Source: https://github.com/pixel/%{name}/archive/%{version}.tar.gz
+Source: %{forgesource}
 
 Patch1: hexedit-1.2.13-config.patch
 # Document --color option.  Sent upstream 2013-04-05.
-Patch2: hexedit-1.5.patch
+Patch2: hexedit-1.6-fix-lsm.patch
 
 BuildRequires: ncurses-devel
 BuildRequires: gcc
@@ -22,7 +25,7 @@ as the file is read a piece at a time. Hexedit can be used to modify the file
 and search through it.
 
 %prep
-%setup -q -n %{name}-%{version}
+%forgesetup
 
 %patch1 -p1 -b .config
 %patch2 -p1
@@ -44,6 +47,10 @@ make install \
 %{_mandir}/man1/hexedit.1*
 
 %changelog
+* Mon May 02 2022 Richard W.M. Jones <rjones@redhat.com> - 1.6-1
+- New upstream version 1.6
+  resolves: rhbz#2081103
+
 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.5-3
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688
diff --git a/sources b/sources
index 903f9e0..02b6b96 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (1.5.tar.gz) = 9d8e5c8c0cda0af17ffeaf528e3dacd7fc2878dfc0755cb055dae5c56f05c961353c1d1723b05897314b49a44a6eb96de5d3a599c6b29967425507eea7cc7ca5
+SHA512 (hexedit-1.6.tar.gz) = 9783406f253a67fe048ec12306df1a601b7ba92cd7a0399ad2f103aed5a3164cd21ad7c1d547a4c55192cfb7da2b2517152015a4c3db402a9217548b435f602d