diff --git a/BaseBuild/Basesys/Linux-PAM b/BaseBuild/Basesys/Linux-PAM
index e7d32ea..ba4b289 100644
--- a/BaseBuild/Basesys/Linux-PAM
+++ b/BaseBuild/Basesys/Linux-PAM
@@ -110,6 +110,10 @@ postmk() {
 	if [ -f /bin/pwd ]; then
 		rm /bin/pwd
 	fi
+	if [ -d $TMPROOT/share ]; then
+		mkdir -p $TMPROOT/usr
+		mv $TMPROOT/share/* $TMPROOT/usr/share
+	fi
 	for i in acct auth passwd session; do
 		ln -s pam_unix.so $TMPROOT/lib/security/pam_unix_$i.so
 		if [ "$MK64BIT" == "true" ]; then
diff --git a/BaseBuild/Basesys/module-init-tools b/BaseBuild/Basesys/module-init-tools
index c20f89f..814bbc6 100644
--- a/BaseBuild/Basesys/module-init-tools
+++ b/BaseBuild/Basesys/module-init-tools
@@ -86,5 +86,8 @@ mk() {
 }
 
 postmk() {
-	echo "Nothing to do for postmk()"
+	if [ -d $TMPROOT/share ]; then
+		mkdir -p $TMPROOT/usr
+		mv $TMPROOT/share $TMPROOT/usr/
+	fi
 }
diff --git a/SysBuild/network/tftp-hpa b/SysBuild/network/tftp-hpa
index 30f71e3..f2e8fec 100644
--- a/SysBuild/network/tftp-hpa
+++ b/SysBuild/network/tftp-hpa
@@ -92,5 +92,8 @@ postmk() {
 	cp README* $TMPROOT/usr/share/doc
 	mkdir -p $TMPROOT/etc/xinetd.d
 	cp tftp-xinetd $TMPROOT/etc/xinetd.d/tftp
+	if [ -d $TMPROOT/man ]; then
+		mv $TMPROOT/man $TMPROOT/usr/share
+	fi
 	echo >$TMPROOT/usr/share/doc/inetd-example "tftp    dgram   udp     wait    root    /usr/sbin/in.tftpd in.tftpd -s /tftpboot"
 }