diff --git a/contrib/debian/rules b/contrib/debian/rules
index 568e7a940..9025d9975 100755
--- a/contrib/debian/rules
+++ b/contrib/debian/rules
@@ -58,7 +58,7 @@ override_dh_install:
 	#install the EFI binaries if needed
 	if [ -d debian/tmp/usr/libexec/fwupd/efi/ ]; then \
 		dh_install -pfwupd usr/libexec/fwupd/efi ;\
-		dh_install -pfwupd usr/libexec/fwupd/fwupdate; \
+		dh_install -pfwupd usr/bin/fwupdate; \
 	fi
 	#if build with meson subproject in CI need to install this too
 	if [ ! -z "$$CI" ] && [ -f debian/tmp/usr/lib/xb-tool ]; then \
diff --git a/contrib/fwupd.spec.in b/contrib/fwupd.spec.in
index bc92274d2..3dc6d2191 100644
--- a/contrib/fwupd.spec.in
+++ b/contrib/fwupd.spec.in
@@ -215,9 +215,6 @@ Data files for installed tests.
 %endif
 %global fwup_efi_fn $RPM_BUILD_ROOT%{_libexecdir}/fwupd/efi/fwupd%{efiarch}.efi
 %pesign -s -i %{fwup_efi_fn} -o %{fwup_efi_fn}.signed
-%if 0%{?rhel} > 7
-ln -s %{_libexecdir}/fwupd/fwupdate $RPM_BUILD_ROOT%{_bindir}/fwupdate
-%endif
 %endif
 
 mkdir -p --mode=0700 $RPM_BUILD_ROOT%{_localstatedir}/lib/fwupd/gnupg
@@ -252,10 +249,7 @@ mkdir -p --mode=0700 $RPM_BUILD_ROOT%{_localstatedir}/lib/fwupd/gnupg
 %if 0%{?have_uefi}
 %{_libexecdir}/fwupd/efi/*.efi
 %{_libexecdir}/fwupd/efi/*.efi.signed
-%{_libexecdir}/fwupd/fwupdate
-%if 0%{?rhel} > 7
 %{_bindir}/fwupdate
-%endif
 %{_libexecdir}/fwupd/fwupdtpmevlog
 %endif
 %{_bindir}/dfu-tool
@@ -290,6 +284,9 @@ mkdir -p --mode=0700 $RPM_BUILD_ROOT%{_localstatedir}/lib/fwupd/gnupg
 %{_datadir}/man/man1/fwupdagent.1.gz
 %{_datadir}/man/man1/dfu-tool.1.gz
 %{_datadir}/man/man1/fwupdmgr.1.gz
+%if 0%{?have_uefi}
+%{_datadir}/man/man1/fwupdate.1.gz
+%endif
 %{_datadir}/metainfo/org.freedesktop.fwupd.metainfo.xml
 %{_datadir}/icons/hicolor/scalable/apps/org.freedesktop.fwupd.svg
 %{_datadir}/fwupd/firmware_packager.py
diff --git a/plugins/uefi/meson.build b/plugins/uefi/meson.build
index 6bd80834d..67bc373a9 100644
--- a/plugins/uefi/meson.build
+++ b/plugins/uefi/meson.build
@@ -57,7 +57,7 @@ shared_module('fu_plugin_uefi',
   ],
 )
 
-executable(
+fwupdate = executable(
   'fwupdate',
   resources_src,
   fu_hash,
@@ -93,10 +93,27 @@ executable(
     fwupdplugin,
   ],
   install : true,
-  install_dir : join_paths(libexecdir, 'fwupd'),
+  install_dir : bindir,
   c_args : cargs,
 )
 
+if get_option('man')
+  custom_target('fwupdate-man',
+    input : fwupdate,
+    output : 'fwupdate.1',
+    command : [
+      help2man, '@INPUT@',
+      '--no-info',
+      '--output', '@OUTPUT@',
+      '--name', 'fwupd',
+      '--manual', 'User Commands',
+      '--version-string', fwupd_version,
+    ],
+    install : true,
+    install_dir : join_paths(mandir, 'man1'),
+  )
+endif
+
 install_data(['uefi.conf'],
   install_dir:  join_paths(sysconfdir, 'fwupd')
 )