diff --git a/Makefile b/Makefile
index 5eba64d8..8a2f77ff 100644
--- a/Makefile
+++ b/Makefile
@@ -79,7 +79,7 @@ DOCS := doc/CONFIGURATION doc/QUICKSTART doc/SECURITY doc/TROUBLESHOOTING
 DOCS_DEST := $(DESTDIR)$(PREFIX)/share/doc/pam_usb
 
 # Man
-MANS := doc/pamusb-conf.1.gz doc/pamusb-agent.1.gz doc/pamusb-check.1.gz doc/pamusb-keyring-unlock-gnome.1.gz
+MANS := doc/pamusb-conf.1.gz doc/pamusb-agent.1.gz doc/pamusb-check.1.gz doc/pamusb-keyring-unlock-gnome.1.gz doc/pamusb-pinentry.1.gz
 MANS_DEST := $(DESTDIR)$(PREFIX)/share/man/man1
 
 # PAM config
diff --git a/doc/pamusb-pinentry.1 b/doc/pamusb-pinentry.1
new file mode 100644
index 00000000..babc4def
--- /dev/null
+++ b/doc/pamusb-pinentry.1
@@ -0,0 +1,12 @@
+.TH pamusb-pinentry 1 "November 03, 2024" "" "PAM_USB"
+
+.SH NAME
+\fBpamusb-pinentry \fP- pam_usb tool to be used as pinentry application
+.SH DESCRIPTION
+\fBpamusb-pinentry\fP is a tool to unlock your GPG keyring when used with pam_usb autologin.
+.SH CONFIGURATION
+See the pam_usb Wiki <https://github.com/mcdope/pam_usb/wiki/Getting-Started#auto-unlock-your-gpg-keys> for details about how to configure this feature.
+.SH BUGS
+Please post bug reports on the Github issue tracker.
+.SH AUTHOR
+Tobias Bäumer <tobiasbaeumer@gmail.com>
diff --git a/fedora/SPECS/pam_usb.spec b/fedora/SPECS/pam_usb.spec
index ea90a1e0..06d1e837 100644
--- a/fedora/SPECS/pam_usb.spec
+++ b/fedora/SPECS/pam_usb.spec
@@ -52,13 +52,14 @@ rm -rf %{buildroot}/usr/share/pam-configs
 %doc %attr(0644,root,root) /usr/share/man/man1/pamusb-check.1.gz
 %doc %attr(0644,root,root) /usr/share/man/man1/pamusb-conf.1.gz
 %doc %attr(0644,root,root) /usr/share/man/man1/pamusb-keyring-unlock-gnome.1.gz
+%doc %attr(0644,root,root) /usr/share/man/man1/pamusb-pinentry.1.gz
 %doc %attr(0644,root,root) /usr/share/doc/pam_usb/CONFIGURATION
 %doc %attr(0644,root,root) /usr/share/doc/pam_usb/QUICKSTART
 %doc %attr(0644,root,root) /usr/share/doc/pam_usb/SECURITY
 %doc %attr(0644,root,root) /usr/share/doc/pam_usb/TROUBLESHOOTING
 
 %changelog
-* Thu Jul 26 2024 Tobias Bäumer <tobiasbaeumer@gmail.com> - 0.8.5
+* Fri Jul 26 2024 Tobias Bäumer <tobiasbaeumer@gmail.com> - 0.8.5
 - [Feature] Support multiple devices per user
 - [Enhancement] Misc. memory and string handling stuff
 - [Enhancement] Deny if pads can't be updated