diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml
index 926e605d911..60fba4e6910 100644
--- a/jetty-distribution/pom.xml
+++ b/jetty-distribution/pom.xml
@@ -220,6 +220,7 @@
                     <outputDirectory>${assembly-directory}/lib/annotations</outputDirectory>
                 </configuration>
             </execution>
+            
             <execution>
                 <id>copy-orbit-lib-jta-deps</id>
                 <phase>generate-resources</phase>
@@ -487,4 +488,134 @@
     </dependency>
     -->
   </dependencies>
+  <profiles>
+    <profile>
+      <id>env-linux</id>
+      <activation>
+        <os>
+          <name>Linux</name>
+        </os>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>copy-setuid-deps</id>
+                <phase>generate-resources</phase>
+                <goals>
+                  <goal>copy</goal>
+                </goals>
+                <configuration>
+                  <artifactItems>
+                    <artifactItem>
+                      <groupId>org.eclipse.jetty.setuid</groupId>
+                      <artifactId>jetty-setuid-java</artifactId>
+                      <version>${project.version}</version>
+                      <type>jar</type>
+                      <overWrite>true</overWrite>
+                      <outputDirectory>${assembly-directory}/lib/setuid</outputDirectory>
+                    </artifactItem>
+                    <artifactItem>
+                      <groupId>org.eclipse.jetty.setuid</groupId>
+                      <artifactId>libsetuid-linux</artifactId>
+                      <version>${project.version}</version>
+                      <type>so</type>
+                      <overWrite>true</overWrite>
+                      <outputDirectory>${assembly-directory}/lib/setuid</outputDirectory>
+                    </artifactItem>
+                  </artifactItems>
+                </configuration>
+              </execution>
+              <execution>
+                <id>unpack-setuid</id>
+                <phase>process-resources</phase>
+                <goals>
+                  <goal>unpack</goal>
+                </goals>
+                <configuration>
+                  <artifactItems>
+                    <artifactItem>
+                      <groupId>org.eclipse.jetty.setuid</groupId>
+                      <artifactId>jetty-setuid-java</artifactId>
+                      <version>${project.version}</version>
+                      <classifier>config</classifier>
+                      <type>jar</type>
+                      <overWrite>true</overWrite>
+                      <outputDirectory>${assembly-directory}</outputDirectory>
+                    </artifactItem>
+                  </artifactItems>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>env-mac</id>
+      <activation>
+        <os>
+          <family>mac</family>
+        </os>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>copy-setuid-deps</id>
+                <phase>generate-resources</phase>
+                <goals>
+                  <goal>copy</goal>
+                </goals>
+                <configuration>
+                  <artifactItems>
+                    <artifactItem>
+                      <groupId>org.eclipse.jetty.setuid</groupId>
+                      <artifactId>jetty-setuid-java</artifactId>
+                      <version>${project.version}</version>
+                      <type>jar</type>
+                      <overWrite>true</overWrite>
+                      <outputDirectory>${assembly-directory}/lib/setuid</outputDirectory>
+                    </artifactItem>
+                    <artifactItem>
+                      <groupId>org.eclipse.jetty.setuid</groupId>
+                      <artifactId>libsetuid-osx</artifactId>
+                      <version>${project.version}</version>
+                      <type>so</type>
+                      <overWrite>true</overWrite>
+                      <outputDirectory>${assembly-directory}/lib/setuid</outputDirectory>
+                    </artifactItem>
+                  </artifactItems>
+                </configuration>
+              </execution>
+              <execution>
+                <id>unpack-setuid</id>
+                <phase>process-resources</phase>
+                <goals>
+                  <goal>unpack</goal>
+                </goals>
+                <configuration>
+                  <artifactItems>
+                    <artifactItem>
+                      <groupId>org.eclipse.jetty.setuid</groupId>
+                      <artifactId>jetty-setuid-java</artifactId>
+                      <version>${project.version}</version>
+                      <classifier>config</classifier>
+                      <type>jar</type>
+                      <overWrite>true</overWrite>
+                      <outputDirectory>${assembly-directory}</outputDirectory>
+                    </artifactItem>
+                  </artifactItems>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 </project>
diff --git a/jetty-setuid/jetty-setuid-test/pom.xml b/jetty-setuid/jetty-setuid-test/pom.xml
index 7ebfbb1d0cd..1e2f14e020c 100644
--- a/jetty-setuid/jetty-setuid-test/pom.xml
+++ b/jetty-setuid/jetty-setuid-test/pom.xml
@@ -71,12 +71,12 @@
                   <artifactItems>
                     <artifactItem>
                       <groupId>org.eclipse.jetty.setuid</groupId>
-                      <artifactId>libsetuid_osx</artifactId>
+                      <artifactId>libsetuid-osx</artifactId>
                       <version>${project.version}</version>
                       <type>so</type>
                       <overWrite>true</overWrite>
                       <outputDirectory>target/native</outputDirectory>
-                      <destFileName>libsetuid.so</destFileName>
+                      <!--destFileName>libsetuid.so</destFileName-->
                     </artifactItem>
                   </artifactItems>
                 </configuration>
@@ -85,14 +85,14 @@
           </plugin>
         </plugins>
       </build>
-      <dependencies>
+      <!-- dependencies>
         <dependency>
           <groupId>org.eclipse.jetty.setuid</groupId>
-          <artifactId>libsetuid_osx</artifactId>
+          <artifactId>libsetuid-osx</artifactId>
           <version>${project.version}</version>
           <type>so</type>
         </dependency>
-      </dependencies>
+      </dependencies-->
     </profile>
   </profiles>
 </project>
diff --git a/jetty-setuid/jetty-setuid-test/src/test/java/org/eclipse/jetty/setuid/TestSetuid.java b/jetty-setuid/jetty-setuid-test/src/test/java/org/eclipse/jetty/setuid/TestSetuid.java
index cf5d8598e97..106aaa7d9e8 100644
--- a/jetty-setuid/jetty-setuid-test/src/test/java/org/eclipse/jetty/setuid/TestSetuid.java
+++ b/jetty-setuid/jetty-setuid-test/src/test/java/org/eclipse/jetty/setuid/TestSetuid.java
@@ -34,10 +34,14 @@ public class TestSetuid extends TestCase
     
         try
         {      
-					// TODO use the dependency plugin to grab the proper lib and put it into place, no relative goop           
-            File lib = MavenTestingUtils.getTargetFile("native/libsetuid.so");
+            /* This is a test of the -VERSION based loading mechanism, the 
+             * jetty.lib logic in SetUID looks in a directory of jetty.lib
+             * and tries to load the file ending in the VERISON.so which is
+             * the mechanism used by default in jetty-distro now
+             */
+            File lib = new File(MavenTestingUtils.getTargetDir(), "native");
             String libPath = lib.getCanonicalPath();
-            System.setProperty("jetty.libsetuid.path", libPath);   
+            System.setProperty("jetty.lib", libPath);   
             
             
             try
diff --git a/jetty-setuid/libsetuid_linux/pom.xml b/jetty-setuid/libsetuid-linux/pom.xml
similarity index 94%
rename from jetty-setuid/libsetuid_linux/pom.xml
rename to jetty-setuid/libsetuid-linux/pom.xml
index 9d8e79b430e..0ff7300c2ee 100644
--- a/jetty-setuid/libsetuid_linux/pom.xml
+++ b/jetty-setuid/libsetuid-linux/pom.xml
@@ -6,16 +6,15 @@
     <version>9.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>libsetuid_linux</artifactId>
+  <artifactId>libsetuid-linux</artifactId>
   <name>Jetty :: SetUID Linux Native</name>
   <packaging>so</packaging>
   <properties>
     <native-source-dir>target/native</native-source-dir>
     <jetty-setuid-linkerStartOption>-shared -lc -ldl-shared -lc -ldl</jetty-setuid-linkerStartOption>
-    <jetty-setuid-linkerEndOption>target/libsetuid_linux.so</jetty-setuid-linkerEndOption>
+    <jetty-setuid-linkerEndOption>target/libsetuid-linux.so</jetty-setuid-linkerEndOption>
   </properties>
   <build>
-    <finalName>libsetuid_linux</finalName>
     <plugins>
       <plugin>
         <artifactId>maven-dependency-plugin</artifactId>
@@ -86,7 +85,7 @@
           </linkerStartOptions>
           <linkerEndOptions>
             <linkerEndOptions>-o
-              ${project.build.directory}/libsetuid.so</linkerEndOptions>
+              ${project.build.directory}/libsetuid-linux.so</linkerEndOptions>
           </linkerEndOptions>
         </configuration>
         <executions>
diff --git a/jetty-setuid/libsetuid_osx/pom.xml b/jetty-setuid/libsetuid-osx/pom.xml
similarity index 94%
rename from jetty-setuid/libsetuid_osx/pom.xml
rename to jetty-setuid/libsetuid-osx/pom.xml
index 8adda63207c..912d2b78933 100644
--- a/jetty-setuid/libsetuid_osx/pom.xml
+++ b/jetty-setuid/libsetuid-osx/pom.xml
@@ -6,17 +6,16 @@
     <version>9.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>libsetuid_osx</artifactId>
+  <artifactId>libsetuid-osx</artifactId>
   <name>Jetty :: SetUID OSX Native</name>
   <packaging>so</packaging>
   <properties>
     <native-source-dir>target/generated</native-source-dir>
     <jetty-setuid-linkerStartOption>-lc -ldl -dynamiclib -undefined
       dynamic_lookup -single_module</jetty-setuid-linkerStartOption>
-    <jetty-setuid-linkerEndOption>target/libsetuid_osx.so</jetty-setuid-linkerEndOption>
+    <jetty-setuid-linkerEndOption>target/libsetuid-osx.so</jetty-setuid-linkerEndOption>
   </properties>
   <build>
-    <finalName>libsetuid_osx</finalName>
     <plugins>
       <plugin>
         <artifactId>maven-dependency-plugin</artifactId>
@@ -64,7 +63,7 @@
           </linkerStartOptions>
           <linkerEndOptions>
             <linkerEndOptions>-o
-              ${project.build.directory}/libsetuid_osx.so</linkerEndOptions>
+              ${project.build.directory}/libsetuid-osx.so</linkerEndOptions>
           </linkerEndOptions>
         </configuration>
         <executions>
diff --git a/jetty-setuid/pom.xml b/jetty-setuid/pom.xml
index c6d0669eeba..49e8daa0c9f 100644
--- a/jetty-setuid/pom.xml
+++ b/jetty-setuid/pom.xml
@@ -23,7 +23,7 @@
                 </os>
             </activation>
             <modules>
-                <module>jetty-setuid-linux</module>
+                <module>libsetuid-linux</module>
             </modules>
         </profile>
         <profile>
@@ -34,7 +34,7 @@
                 </os>
             </activation>
             <modules>         
-                <module>jetty-setuid-osx</module>
+                <module>libsetuid-osx</module>
             </modules>          
         </profile>
 
diff --git a/pom.xml b/pom.xml
index 8ba74c34b63..eed7d4f7841 100644
--- a/pom.xml
+++ b/pom.xml
@@ -415,6 +415,7 @@
     <module>aggregates/jetty-all</module>
     <module>jetty-distribution</module>
     <module>jetty-runner</module>
+    <module>jetty-setuid</module>
 
     <!-- modules that need fixed and added back, or simply dropped and not maintained
     <module>tests</module>