diff --git a/makerpm.pl b/makerpm.pl
index 7fc89d02..9b8a2fcd 100755
--- a/makerpm.pl
+++ b/makerpm.pl
@@ -186,7 +186,7 @@
 if [ "\$inetd" != "1" ]; then
 	/etc/usermin/restart >/dev/null 2>&1 </dev/null
 	if [ "\$?" != "0" ]; then
-		echo "error: Usermin server cannot be started. It is advised to start it manually\n        by running \\"/etc/usermin/restart-by-force-kill\\" command"
+		echo "error: Usermin server cannot be started. It is advised to start it manually\n       by running \\"/etc/usermin/restart-by-force-kill\\" command"
 	fi
 fi
 cat >/etc/usermin/uninstall.sh <<EOFF
@@ -196,6 +196,7 @@
 printf "\\n"
 if [ "\\\$answer" = "y" ]; then
 	echo "Removing Usermin RPM .."
+	rm -f /usr/libexec/usermin/authentic-theme/manifest-*
 	rpm -e --nodeps usermin
 	systemctlcmd=\\\`which systemctl 2>/dev/null\\\`
 	if [ -x "\\\$systemctlcmd" ]; then
@@ -233,6 +234,7 @@
 		# RPM is being removed, and no new version of usermin
 		# has taken it's place. Stop the server
 		/etc/usermin/stop >/dev/null 2>&1 </dev/null
+		rm -f /usr/libexec/usermin/authentic-theme/manifest-*
 	fi
 fi
 /bin/true
diff --git a/setup.sh b/setup.sh
index ef7f3288..c806824c 100755
--- a/setup.sh
+++ b/setup.sh
@@ -754,6 +754,11 @@ else
 	rm -f $config_dir/install-dir
 fi
 
+# Create manifest link for Authentic
+if [ -r "$wadir/authentic-theme/postinstall-usermin.pl" ]; then
+	(cd "$wadir" ; WEBMIN_CONFIG="$config_dir" WEBMIN_VAR="$var_dir" PERLLIB="$wadir" LANG= "$wadir/authentic-theme/postinstall-usermin.pl") >/dev/null 2>&1 </dev/null
+fi
+
 # Run package-defined post-install script
 if [ -r "$srcdir/setup-post.sh" ]; then
 	. "$srcdir/setup-post.sh"