diff --git a/Makefile b/Makefile
index b6fd203a..51637e9b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 LIBPE_DIR = lib/libpe
 PEV_DIR = src
-VERSION = 0.81
+VERSION = 0.82
 ZIPDIR = pev-$(VERSION)-win
 ZIPFILE = $(ZIPDIR).zip
 
diff --git a/completion/bash/readpe b/completion/bash/readpe
new file mode 100644
index 00000000..d36e4b43
--- /dev/null
+++ b/completion/bash/readpe
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+complete -F _longopt readpe
+complete -F _longopt pedis
+complete -F _longopt pehash
+complete -F _longopt peldd
+complete -F _longopt pepack
+complete -F _longopt peres
+complete -F _longopt pescan
+complete -F _longopt pesec
+complete -F _longopt pestr
+
diff --git a/completion/zsh/_readpe b/completion/zsh/_readpe
new file mode 100644
index 00000000..46f203ce
--- /dev/null
+++ b/completion/zsh/_readpe
@@ -0,0 +1,14 @@
+#compdef readpe
+#
+# Completion script for swaylock
+#
+compdef _gnu_generic readpe
+compdef _gnu_generic pedis
+compdef _gnu_generic pehash
+compdef _gnu_generic peldd
+compdef _gnu_generic pepack
+compdef _gnu_generic peres
+compdef _gnu_generic pescan
+compdef _gnu_generic pesec
+compdef _gnu_generic pestr
+
diff --git a/doc/manpages/ofs2rva.1 b/doc/manpages/ofs2rva.1
index ce090ec7..002c67af 100644
--- a/doc/manpages/ofs2rva.1
+++ b/doc/manpages/ofs2rva.1
@@ -30,7 +30,7 @@ Get RVA of 0x1b9b8 offset of \fBcalc.exe\fP:
 $ ofs2rva 0x1b9b8 calc.exe
 
 .SH REPORTING BUGS
-Please, check the latest development code and report at https://github.com/merces/pev/issues
+Please, check the latest development code and report at https://github.com/mentebinaria/readpe/issues
 
 .SH SEE ALSO
 \fBpedis\fP(1), \fBpehash\fP(1), \fBpeldd\fP(1), \fBpepack\fP(1), \fBperes\fP(1), \fBpescan\fP(1), \fBpesec\fP(1), \fBpestr\fP(1), \fBreadpe\fP(1), \fBrva2ofs\fP(1)
diff --git a/doc/manpages/pedis.1 b/doc/manpages/pedis.1
index ff02a72a..4a706660 100644
--- a/doc/manpages/pedis.1
+++ b/doc/manpages/pedis.1
@@ -74,7 +74,7 @@ Disassembly in 16-bits mode, starting from offset 0x40, 32 bytes of code from \f
 $ pedis -m 16 -o 0x40 -n 32 game.exe
 
 .SH REPORTING BUGS
-Please, check the latest development code and report at https://github.com/merces/pev/issues
+Please, check the latest development code and report at https://github.com/mentebinaria/readpe/issues
 
 .SH SEE ALSO
 \fBofs2rva\fP(1), \fBpehash\fP(1), \fBpeldd\fP(1), \fBpepack\fP(1), \fBperes\fP(1), \fBpescan\fP(1), \fBpesec\fP(1), \fBpestr\fP(1), \fBreadpe\fP(1), \fBrva2ofs\fP(1)
diff --git a/doc/manpages/pehash.1 b/doc/manpages/pehash.1
index f57bc08c..fa8e41ae 100644
--- a/doc/manpages/pehash.1
+++ b/doc/manpages/pehash.1
@@ -51,7 +51,7 @@ Check all supported checksums of \fBputty.exe\fP file:
 $ pehash -a putty.exe
 
 .SH REPORTING BUGS
-Please, check the latest development code and report at https://github.com/merces/pev/issues
+Please, check the latest development code and report at https://github.com/mentebinaria/readpe/issues
 
 .SH SEE ALSO
 \fBofs2rva\fP(1), \fBpedis\fP(1), \fBpeldd\fP(1), \fBpepack\fP(1), \fBperes\fP(1), \fBpescan\fP(1), \fBpesec\fP(1), \fBpestr\fP(1), \fBreadpe\fP(1), \fBrva2ofs\fP(1)
diff --git a/doc/manpages/peldd.1 b/doc/manpages/peldd.1
index 578e590a..e401bd9f 100644
--- a/doc/manpages/peldd.1
+++ b/doc/manpages/peldd.1
@@ -35,7 +35,7 @@ Show library dependencies for \fBputty.exe\fP:
 $ peldd putty.exe
 
 .SH REPORTING BUGS
-Please, check the latest development code and report at https://github.com/merces/pev/issues
+Please, check the latest development code and report at https://github.com/mentebinaria/readpe/issues
 
 .SH SEE ALSO
 \fBofs2rva\fP(1), \fBpedis\fP(1), \fBpehash\fP(1), \fBpepack\fP(1), \fBperes\fP(1), \fBpescan\fP(1), \fBpesec\fP(1), \fBpestr\fP(1), \fBreadpe\fP(1), \fBrva2ofs\fP(1)
diff --git a/doc/manpages/pepack.1 b/doc/manpages/pepack.1
index d8981166..5511a4c4 100644
--- a/doc/manpages/pepack.1
+++ b/doc/manpages/pepack.1
@@ -36,7 +36,7 @@ Check \fBsample.exe\fP for packers signatures:
 $ pepack sample.exe
 
 .SH REPORTING BUGS
-Please, check the latest development code and report at https://github.com/merces/pev/issues
+Please, check the latest development code and report at https://github.com/mentebinaria/readpe/issues
 
 .SH SEE ALSO
 \fBofs2rva\fP(1), \fBpedis\fP(1), \fBpehash\fP(1), \fBpeldd\fP(1), \fBperes\fP(1), \fBpescan\fP(1), \fBpesec\fP(1), \fBpestr\fP(1), \fBreadpe\fP(1), \fBrva2ofs\fP(1)
diff --git a/doc/manpages/peres.1 b/doc/manpages/peres.1
index eb9ead76..c416290e 100644
--- a/doc/manpages/peres.1
+++ b/doc/manpages/peres.1
@@ -51,7 +51,7 @@ Show resources statistics of \fBputty.exe\fP:
 $ peres -s putty.exe
 
 .SH REPORTING BUGS
-Please, check the latest development code and report at https://github.com/merces/pev/issues
+Please, check the latest development code and report at https://github.com/mentebinaria/readpe/issues
 
 .SH SEE ALSO
 \fBofs2rva\fP(1), \fBpedis\fP(1), \fBpehash\fP(1), \fBpeldd\fP(1), \fBpepack\fP(1), \fBpescan\fP(1), \fBpesec\fP(1), \fBpestr\fP(1), \fBreadpe\fP(1), \fBrva2ofs\fP(1)
diff --git a/doc/manpages/pescan.1 b/doc/manpages/pescan.1
index 7700eb68..58a18230 100644
--- a/doc/manpages/pescan.1
+++ b/doc/manpages/pescan.1
@@ -36,7 +36,7 @@ Search suspicious things in \fBputty.exe\fP:
 $ pescan putty.exe
 
 .SH REPORTING BUGS
-Please, check the latest development code and report at https://github.com/merces/pev/issues
+Please, check the latest development code and report at https://github.com/mentebinaria/readpe/issues
 
 .SH SEE ALSO
 \fBofs2rva\fP(1), \fBpedis\fP(1), \fBpehash\fP(1), \fBpeldd\fP(1), \fBpepack\fP(1), \fBperes\fP(1), \fBpesec\fP(1), \fBpestr\fP(1), \fBreadpe\fP(1), \fBrva2ofs\fP(1)
diff --git a/doc/manpages/pesec.1 b/doc/manpages/pesec.1
index 6b04610e..aba7b24e 100644
--- a/doc/manpages/pesec.1
+++ b/doc/manpages/pesec.1
@@ -39,7 +39,7 @@ Search for protections in \fBputty.exe\fP:
 $ pesec putty.exe
 
 .SH REPORTING BUGS
-Please, check the latest development code and report at https://github.com/merces/pev/issues
+Please, check the latest development code and report at https://github.com/mentebinaria/readpe/issues
 
 .SH SEE ALSO
 \fBofs2rva\fP(1), \fBpedis\fP(1), \fBpehash\fP(1), \fBpeldd\fP(1), \fBpepack\fP(1), \fBperes\fP(1), \fBpescan\fP(1), \fBpestr\fP(1), \fBreadpe\fP(1), \fBrva2ofs\fP(1)
diff --git a/doc/manpages/pestr.1 b/doc/manpages/pestr.1
index 83d6669c..699cce9d 100644
--- a/doc/manpages/pestr.1
+++ b/doc/manpages/pestr.1
@@ -39,7 +39,7 @@ Search all strings in \fBputty.exe\fP:
 $ pestr putty.exe
 
 .SH REPORTING BUGS
-Please, check the latest development code and report at https://github.com/merces/pev/issues
+Please, check the latest development code and report at https://github.com/mentebinaria/readpe/issues
 
 .SH SEE ALSO
 \fBofs2rva\fP(1), \fBpedis\fP(1), \fBpehash\fP(1), \fBpeldd\fP(1), \fBpepack\fP(1), \fBperes\fP(1), \fBpescan\fP(1), \fBpesec\fP(1), \fBreadpe\fP(1), \fBrva2ofs\fP(1)
diff --git a/doc/manpages/readpe.1 b/doc/manpages/readpe.1
index 992f7cb5..bf3936ab 100644
--- a/doc/manpages/readpe.1
+++ b/doc/manpages/readpe.1
@@ -69,7 +69,7 @@ Display all possible information about \fBsvchost.exe\fP file:
 $ readpe svchost.exe
 
 .SH REPORTING BUGS
-Please, check the latest development code and report at https://github.com/merces/pev/issues
+Please, check the latest development code and report at https://github.com/mentebinaria/readpe/issues
 
 .SH SEE ALSO
 \fBofs2rva\fP(1), \fBpedis\fP(1), \fBpehash\fP(1), \fBpeldd\fP(1), \fBpepack\fP(1), \fBperes\fP(1), \fBpescan\fP(1), \fBpesec\fP(1), \fBpestr\fP(1), \fBrva2ofs\fP(1)
diff --git a/doc/manpages/rva2ofs.1 b/doc/manpages/rva2ofs.1
index 248303fc..f4f16033 100644
--- a/doc/manpages/rva2ofs.1
+++ b/doc/manpages/rva2ofs.1
@@ -30,7 +30,7 @@ Get offset from RVA 0x12db of \fBcards.dll\fP:
 $ rva2ofs 0x12db cards.dll
 
 .SH REPORTING BUGS
-Please, check the latest development code and report at https://github.com/merces/pev/issues
+Please, check the latest development code and report at https://github.com/mentebinaria/readpe/issues
 
 .SH SEE ALSO
 \fBofs2rva\fP(1), \fBpedis\fP(1), \fBpehash\fP(1), \fBpeldd\fP(1), \fBpepack\fP(1), \fBperes\fP(1), \fBpescan\fP(1), \fBpesec\fP(1), \fBpestr\fP(1), \fBreadpe\fP(1)
diff --git a/doc/manual/en_us/install.docbook b/doc/manual/en_us/install.docbook
index e80e7a32..82ed240b 100644
--- a/doc/manual/en_us/install.docbook
+++ b/doc/manual/en_us/install.docbook
@@ -65,10 +65,10 @@ named pev-x.xx.tar.gz, where x.xx is the version number you want.
 </para>
 
 <para>You can have the most up to date source code from the
-<ulink url="https://github.com/merces/pev">pev repository on GitHub</ulink> (recommended).
+<ulink url="https://github.com/mentebinaria/readpe">pev repository on GitHub</ulink> (recommended).
 If you have git installed, run the following:</para>
 
-<prompt>$ </prompt> <command>git clone --recursive git://github.com/merces/pev.git</command>
+<prompt>$ </prompt> <command>git clone --recursive git://github.com/mentebinaria/readpe.git</command>
 
 <para>
 Even without git installed, you can download a ZIP or tarball file from project web page
@@ -83,7 +83,7 @@ Make sure you have the following dependencies installed and working properly:
 </para>
 
 <simplelist>
-<member><ulink url="https://github.com/merces/libpe">libpe</ulink> (included if you've used the --recursive option of git command)</member>
+<member><ulink url="https://github.com/mentebinaria/readpe">libpe</ulink> (included with in the repository under lib/libpe)</member>
 <member>libssl (used by pehash and pesec)</member>
 <member>gcc</member>
 <member>make</member>
diff --git a/doc/manual/en_us/pev.docbook b/doc/manual/en_us/pev.docbook
index 3ea1c98d..381da0dd 100644
--- a/doc/manual/en_us/pev.docbook
+++ b/doc/manual/en_us/pev.docbook
@@ -43,7 +43,19 @@ Legend:
 - Bug fixed
 ! Known issue / missing feature
 
-pev 0.81 - January 7, 2017
+pev 0.82 - May 12, 2023
+ * added more image machine types
+ - fix build on GNU/hurd and kFreeBSD
+ - fix crash on executables with zero segments
+ - fix various minor memory leaks
+ - improve makefile to make build reproducible
+ - pedis: show error on not x86 code
+ - peres: ignore header resource size
+ - pestr: fix bug with wide character detection
+ - readpe: fix date overflow bug
+ - rva2ofs: fix bug when exe has no offset
+
+pev 0.81 - January 12, 2021
 
  + peldd: new tool to display what DLL's a PE file depends on.
 
diff --git a/include/common.h b/include/common.h
index f3e82595..2ba551bf 100644
--- a/include/common.h
+++ b/include/common.h
@@ -59,8 +59,8 @@
 
 #define MAX_MSG 81
 #define MAX_PATH 256
-#define VERSION "0.81"
-#define TOOLKIT "from pev " VERSION " <https://github.com/merces/pev/> toolkit"
+#define VERSION "0.82"
+#define TOOLKIT "from pev " VERSION " <https://github.com/mentebinaria/readpe/> toolkit"
 #define COPY \
 "License GPLv2+: GNU GPL version 2 or later <https://www.gnu.org/licenses/gpl-2.0.txt>.\n" \
 "This is free software: you are free to change and redistribute it.\n" \
diff --git a/lib/libpe/Makefile b/lib/libpe/Makefile
index bd9c0dc0..b1d8d5dd 100644
--- a/lib/libpe/Makefile
+++ b/lib/libpe/Makefile
@@ -62,7 +62,7 @@ LIBS = -lssl -lcrypto
 #	override CFLAGS += -fPIC
 #endif
 
-VERSION = 1.0
+VERSION = 0.82
 LIBNAME = libpe
 
 SRC_DIRS = $(srcdir) $(srcdir)/libfuzzy
diff --git a/lib/libpe/README.md b/lib/libpe/README.md
index 8b78fa34..0a8a7663 100644
--- a/lib/libpe/README.md
+++ b/lib/libpe/README.md
@@ -1,20 +1,19 @@
 # libpe
 
-[![LGPLv3](https://www.gnu.org/graphics/lgplv3-88x31.png)](http://www.gnu.org/licenses/lgpl.html) ![C/C++ CI](https://github.com/merces/libpe/workflows/C/C++%20CI/badge.svg)
+[![LGPLv3](https://www.gnu.org/graphics/lgplv3-88x31.png)](http://www.gnu.org/licenses/lgpl.html) ![C/C++ CI](https://github.com/mentebinaria/readpe/workflows/C/C++%20CI/badge.svg)
 
-The PE library used by [pev](https://github.com/merces/pev) - the PE file toolkit purely written in C and available to many platforms.
+The PE library used by [pev](https://github.com/mentebinaria/readpe) - the PE file toolkit purely written in C and available to many platforms.
 
 ## Features
 
 - Support for both 32 and 64-bits PE files.
 - ssdeep support (built-in libfuzzy).
-- Disassemble support (built-in libudis86).
 - Imphash support.
 - Crypographic digests calculation (using OpeenSSL).
 
 ## How to get the source code
 
-    git clone https://github.com/merces/libpe.git
+    git clone https://github.com/mentebinaria/readpe.git
 
 ## How to build on Linux
 
diff --git a/pev.spec b/pev.spec
index 0b7ebe2b..28a08f27 100644
--- a/pev.spec
+++ b/pev.spec
@@ -1,11 +1,11 @@
 Name:           pev
-Version:        0.81
+Version:        0.82
 Release:        1
 License:        GPL2
 URL:            http://pev.sf.net/
 Requires:       readline
 BuildRequires:  openssl-devel
-Source0:        https://github.com/merces/pev/archive/v%{version}.tar.gz
+Source0:        https://github.com/mentebinaria/readpe/archive/v%{version}.tar.gz
 Summary:        The PE file analysis toolkit
 
 %description