diff --git a/Makefile b/Makefile
index 9c8ae3ea..6d576f8b 100644
--- a/Makefile
+++ b/Makefile
@@ -24,13 +24,14 @@ enforce: build
 full: build
 	@./${BUILD}/prebuild --complain --full
 
-ROOT = $(shell find "${BUILD}/root" -type f -not -name "*.md" -printf "%P\n")
+SHARE = $(shell find "${BUILD}/share" -type f -not -name "*.md" -printf "%P\n")
 PROFILES = $(shell find "${BUILD}/apparmor.d" -type f -printf "%P\n")
 DISABLES = $(shell find "${BUILD}/apparmor.d" -type l -printf "%P\n")
 install:
+	@install -Dm0755 ${BUILD}/aa ${DESTDIR}/usr/bin/aa
 	@install -Dm0755 ${BUILD}/aa-log ${DESTDIR}/usr/bin/aa-log
-	@for file in ${ROOT}; do \
-		install -Dm0644 "${BUILD}/root/$${file}" "${DESTDIR}/$${file}"; \
+	@for file in ${SHARE}; do \
+		install -Dm0644 "${BUILD}/share/$${file}" "${DESTDIR}/usr/share/$${file}"; \
 	done;
 	@for file in ${PROFILES}; do \
 		install -Dm0644 "${BUILD}/apparmor.d/$${file}" "${DESTDIR}/etc/apparmor.d/$${file}"; \
diff --git a/pkg/prebuild/prepare/synchronise.go b/pkg/prebuild/prepare/synchronise.go
index 741c015c..f3ca44c4 100644
--- a/pkg/prebuild/prepare/synchronise.go
+++ b/pkg/prebuild/prepare/synchronise.go
@@ -27,14 +27,14 @@ func init() {
 
 func (p Synchronise) Apply() ([]string, error) {
 	res := []string{}
-	dirs := paths.PathList{prebuild.RootApparmord, prebuild.Root.Join("root"), prebuild.Root.Join("systemd")}
+	dirs := paths.PathList{prebuild.RootApparmord, prebuild.Root.Join("share"), prebuild.Root.Join("systemd")}
 	for _, dir := range dirs {
 		if err := dir.RemoveAll(); err != nil {
 			return res, err
 		}
 	}
 	if p.Path == "" {
-		for _, name := range []string{"apparmor.d", "root"} {
+		for _, name := range []string{"apparmor.d", "share"} {
 			if err := util.CopyTo(paths.New(name), prebuild.Root.Join(name)); err != nil {
 				return res, err
 			}
diff --git a/root/usr/share/bash-completion/completions/aa-log b/share/bash-completion/completions/aa-log
similarity index 100%
rename from root/usr/share/bash-completion/completions/aa-log
rename to share/bash-completion/completions/aa-log
diff --git a/root/usr/share/libalpm/hooks/apparmor.hook b/share/libalpm/hooks/apparmor.hook
similarity index 100%
rename from root/usr/share/libalpm/hooks/apparmor.hook
rename to share/libalpm/hooks/apparmor.hook
diff --git a/root/usr/share/man/man8/aa-log.8 b/share/man/man8/aa-log.8
similarity index 100%
rename from root/usr/share/man/man8/aa-log.8
rename to share/man/man8/aa-log.8
diff --git a/root/usr/share/man/man8/aa-log.md b/share/man/man8/aa-log.md
similarity index 100%
rename from root/usr/share/man/man8/aa-log.md
rename to share/man/man8/aa-log.md
diff --git a/root/usr/share/zsh/site-functions/_aa-log.zsh b/share/zsh/site-functions/_aa-log.zsh
similarity index 100%
rename from root/usr/share/zsh/site-functions/_aa-log.zsh
rename to share/zsh/site-functions/_aa-log.zsh