diff --git a/archiva-web/archiva-standalone/archiva-jetty/src/main/assembly/bin.xml b/archiva-web/archiva-standalone/archiva-jetty/src/main/assembly/bin.xml
index 38f922583..e3b3911fb 100644
--- a/archiva-web/archiva-standalone/archiva-jetty/src/main/assembly/bin.xml
+++ b/archiva-web/archiva-standalone/archiva-jetty/src/main/assembly/bin.xml
@@ -114,7 +114,7 @@
   </fileSets>
   <dependencySets>
     <dependencySet>
-      <unpack>false</unpack>
+      <unpack>true</unpack>
       <outputDirectory>apps/archiva</outputDirectory>
       <includes>
         <include>org.apache.maven.archiva:archiva-webapp</include>
diff --git a/archiva-web/archiva-standalone/archiva-jetty/src/main/etc/jetty.xml b/archiva-web/archiva-standalone/archiva-jetty/src/main/etc/jetty.xml
index 99970df20..5f5c88419 100644
--- a/archiva-web/archiva-standalone/archiva-jetty/src/main/etc/jetty.xml
+++ b/archiva-web/archiva-standalone/archiva-jetty/src/main/etc/jetty.xml
@@ -305,4 +305,72 @@
     <Arg type="boolean">False</Arg>
   </Call>
   
+  
+  <!-- ARCHIVA CONFIG -->
+	
+  <New id="validation_mail" class="org.mortbay.jetty.plus.naming.Resource">
+    <Arg>mail/Session</Arg>
+    <Arg>
+      <New class="org.mortbay.naming.factories.MailSessionReference">
+        <Set name="user"></Set>
+        <Set name="password"></Set>
+        <Set name="properties">
+          <New class="java.util.Properties">
+            <Put name="mail.smtp.host">localhost</Put>
+            <Put name="mail.from">archiva@localhost</Put>
+            <Put name="mail.senderName">Archiva</Put>
+            <Put name="mail.debug">true</Put>
+          </New>
+        </Set>
+      </New>
+    </Arg>
+  </New>
+
+  <!-- Archiva database -->
+   
+  <New id="archiva" class="org.mortbay.jetty.plus.naming.Resource">
+    <Arg>jdbc/archiva</Arg>
+    <Arg>
+      <New class="org.apache.derby.jdbc.EmbeddedDataSource">
+        <Set name="DatabaseName">../databases/archiva</Set>
+        <Set name="user">sa</Set>
+        <Set name="createDatabase">create</Set>
+      </New>
+    </Arg>
+  </New>
+
+  <New id="archivaShutdown" class="org.mortbay.jetty.plus.naming.Resource">
+    <Arg>jdbc/archivaShutdown</Arg>
+    <Arg>
+      <New class="org.apache.derby.jdbc.EmbeddedDataSource">
+        <Set name="DatabaseName">../databases/archiva</Set>
+        <Set name="user">sa</Set>
+        <Set name="shutdownDatabase">shutdown</Set>
+      </New>
+    </Arg>
+  </New>
+ 
+  <!-- Users / Security Database -->
+  
+  <New id="users" class="org.mortbay.jetty.plus.naming.Resource">
+    <Arg>jdbc/users</Arg>
+    <Arg>
+      <New class="org.apache.derby.jdbc.EmbeddedDataSource">
+        <Set name="DatabaseName">../databases/users</Set>
+        <Set name="user">sa</Set>
+        <Set name="createDatabase">create</Set>
+      </New>
+    </Arg>
+  </New>
+
+  <New id="usersShutdown" class="org.mortbay.jetty.plus.naming.Resource">
+    <Arg>jdbc/usersShutdown</Arg>
+    <Arg>
+      <New class="org.apache.derby.jdbc.EmbeddedDataSource">
+        <Set name="DatabaseName">../databases/users</Set>
+        <Set name="user">sa</Set>
+        <Set name="shutdownDatabase">shutdown</Set>
+      </New>
+    </Arg>
+  </New>
 </Configure>