diff --git a/Manual.md b/Manual.md
index f39df1611b3..905efaf91d5 100644
--- a/Manual.md
+++ b/Manual.md
@@ -1719,8 +1719,9 @@ anything unless it is defined.
 The system-accounts trigger is responsible for creating and disabling system accounts
 and groups.
 
-During removal it will disable the account by setting the Shell to /bin/false and appending
-' - for uninstalled package $pkgname' to the Description.
+During removal it will disable the account by setting the Shell to /bin/false,
+Home to /var/empty, and appending ' - for uninstalled package $pkgname' to the
+Description.
 Example: `transmission unprivileged user - for uninstalled package transmission`
 
 This trigger can only be used by using the `system_accounts` variable.
diff --git a/srcpkgs/xbps-triggers/files/system-accounts b/srcpkgs/xbps-triggers/files/system-accounts
index f2bff502514..77d840f2427 100755
--- a/srcpkgs/xbps-triggers/files/system-accounts
+++ b/srcpkgs/xbps-triggers/files/system-accounts
@@ -122,11 +122,12 @@ run)
 					echo "WARNING: cannot update ${acct} system user/group (missing usermod)"
 					continue
 				fi
-				usermod -c "${descr}" -s "${shell}" ${_uname} >/dev/null 2>&1
+				usermod -c "${descr}" -d "${homedir}" -s "${shell}" ${user_groups} \
+					-g "${pgroup:-${_uname}}" ${_uname} >/dev/null 2>&1
 				if [ $? -eq 0 ]; then
-					echo "Updated shell and comment for ${_uname} (${_uid}) system user."
+					echo "Updated ${_uname} (${_uid}) system user."
 				else
-					echo "Failed to update shell and comment for ${acct} system user!"
+					echo "Failed to update ${acct} system user!"
 					exit 1
 				fi
 			fi
@@ -142,7 +143,7 @@ run)
 					echo "WARNING: cannot disable ${acct} system user/group (missing usermod)"
 					continue
 				fi
-				usermod -L -s /bin/false -c "${comment}" ${_uname} >/dev/null 2>&1
+				usermod -L -d /var/empty -s /bin/false -c "${comment}" ${_uname} >/dev/null 2>&1
 				if [ $? -eq 0 ]; then
 					echo "Disabled ${_uname} (${_uid}) system user/group."
 				fi
diff --git a/srcpkgs/xbps-triggers/template b/srcpkgs/xbps-triggers/template
index 31491f70fe7..790f13b6ef9 100644
--- a/srcpkgs/xbps-triggers/template
+++ b/srcpkgs/xbps-triggers/template
@@ -1,13 +1,13 @@
 # Template file for 'xbps-triggers'
 pkgname=xbps-triggers
-version=0.110
+version=0.111
 revision=1
 noarch=yes
 bootstrap=yes
 short_desc="The XBPS triggers for Void Linux"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
-homepage="http://www.voidlinux.eu"
-license="Simplified BSD"
+homepage="https://voidlinux.org"
+license="BSD-2-clause"
 
 do_install() {
 	_triggersdir=usr/libexec/${pkgname}