diff --git a/pinentry-wrapper b/pinentry-wrapper
index fd714ca..6dd72c5 100755
--- a/pinentry-wrapper
+++ b/pinentry-wrapper
@@ -71,12 +71,12 @@ then
 elif [ -n "$DISPLAY" -a -x /usr/bin/pinentry-qt ]
 then
 	export PINENTRY_BINARY="/usr/bin/pinentry-qt"
-# use pinentry-curses for interactive mode
-elif [ -t 0 -a -t 1 ];
+# use pinentry-tty if installed
+elif [ -x /usr/bin/pinentry-tty ]
 then
-	export PINENTRY_BINARY="/usr/bin/pinentry-curses"
-# fallback to pinentry-tty in no TTY is provided
-else
 	export PINENTRY_BINARY="/usr/bin/pinentry-tty"
+# pinentry-curses is installed by default
+else
+	export PINENTRY_BINARY="/usr/bin/pinentry-curses"
 fi
 exec $PINENTRY_BINARY "$@"
diff --git a/pinentry.spec b/pinentry.spec
index 501b77b..9a9e29d 100644
--- a/pinentry.spec
+++ b/pinentry.spec
@@ -1,7 +1,7 @@
 
 Name:    pinentry
 Version: 1.1.1
-Release: 1%{?dist}
+Release: 3%{?dist}
 Summary: Collection of simple PIN or passphrase entry dialogs
 
 License: GPLv2+
@@ -75,6 +75,15 @@ utilize the Assuan protocol as described by the aegypten project; see
 http://www.gnupg.org/aegypten/ for details.
 This package contains the emacs based version of the PIN entry dialog.
 
+%package tty
+Summary: Passphrase/PIN entry dialog in tty
+Requires: %{name} = %{version}-%{release}
+%description tty
+Pinentry is a collection of simple PIN or passphrase entry dialogs which
+utilize the Assuan protocol as described by the aegypten project; see
+http://www.gnupg.org/aegypten/ for details.
+This package contains the tty version of the PIN entry dialog.
+
 %prep
 %setup -q
 
@@ -111,7 +120,6 @@ rm -fv $RPM_BUILD_ROOT%{_infodir}/dir
 %license COPYING
 %doc AUTHORS ChangeLog NEWS README THANKS TODO
 %{_bindir}/pinentry-curses
-%{_bindir}/pinentry-tty
 %{_bindir}/pinentry
 %{_infodir}/pinentry.info*
 
@@ -131,7 +139,17 @@ rm -fv $RPM_BUILD_ROOT%{_infodir}/dir
 %files emacs
 %{_bindir}/pinentry-emacs
 
+%files tty
+%{_bindir}/pinentry-tty
+
 %changelog
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Jan 26 2021 Jakub Jelen <jjelen@redhat.com> - 1.1.1-2
+- Move pinentry-tty to separate subpackage (#1782442)
+- Update the wrapper selecting the appropriate version (#1918969)
+
 * Fri Jan 22 2021 Jakub Jelen <jjelen@redhat.com> - 1.1.1-1
 - New upstream release (#1919127)