diff --git a/Makefile b/Makefile
index 78ba4ea..bbd4121 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,7 @@ clean: clean-lib
 install-clean-legacy:
 ifneq (,$(wildcard $(INSTALL)/lib/gnat/manifests/aunit))
 	-$(GPRINSTALL) $(GPROPTS) --uninstall --prefix=$(INSTALL) \
-		--project-subdir=lib/gnat aunit
+		aunit
 endif
 
 install-clean: install-clean-legacy
diff --git a/lib/gnat/aunit.gpr b/lib/gnat/aunit.gpr
index 9f9c423..6b1dd83 100644
--- a/lib/gnat/aunit.gpr
+++ b/lib/gnat/aunit.gpr
@@ -1,5 +1,5 @@
-
 with "aunit_shared";
+with "directories";
 
 project AUnit is
 
@@ -50,16 +50,15 @@ project AUnit is
 
    package Install is
       for Artifacts ("share/doc/aunit/pdf")
-        use ("../../doc/pdf/**");
+        use (Directories.IncludeDir & "/doc/" & Project'Name & "/pdf/**");
       for Artifacts ("share/doc/aunit/txt")
-        use ("../../doc/txt/**");
+        use (Directories.IncludeDir & "/doc/" & Project'Name & "/txt/**");
       for Artifacts ("share/doc/aunit/info")
-        use ("../../doc/info/**");
+        use (Directories.IncludeDir & "/doc/" & Project'Name & "/info/**");
       for Artifacts ("share/doc/aunit/html")
-        use ("../../doc/html/**");
-
-      for Artifacts ("share/gps/plug-ins") use ("../../support/aunit.xml");
-      for Artifacts ("share/examples/aunit") use ("../../examples/*");
+        use (Directories.IncludeDir & "/doc/" & Project'Name & "/html/**");
+      for Artifacts ("share/examples/aunit") 
+        use (Directories.IncludeDir & "/doc/" & Project'Name & "/examples/**");
    end Install;
 
 end AUnit;