diff --git a/project.xml b/project.xml
index 11a20e268..256a34db8 100644
--- a/project.xml
+++ b/project.xml
@@ -15,28 +15,64 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <project>
-  <extend>../commons-build/project.xml</extend>
+  <pomVersion>3</pomVersion>
+  
   <id>commons-lang</id>
   <name>Lang</name>
   <currentVersion>2.1-dev</currentVersion>
-
-  <organization>
-    <name>Apache Software Foundation</name>
-    <url>http://www.apache.org</url>
-    <logo>http://jakarta.apache.org/images/jakarta-logo.gif</logo>
-  </organization>
-
   <inceptionYear>2001</inceptionYear>
-
-  <logo>/images/logo.png</logo>
-
+  <shortDescription>Java Common Components</shortDescription>
   <description>
     Commons.Lang, a package of Java utility classes for the
     classes that are in java.lang's hierarchy, or are considered to be so
     standard as to justify existence in java.lang.
   </description>
   
-  <shortDescription>Java Common Components</shortDescription>
+  <logo>/images/logo.png</logo>
+  
+  <url>http://jakarta.apache.org/commons/${pom.artifactId.substring(8)}/</url>
+  <package>org.apache.commons.${pom.artifactId.substring(8)}</package>
+
+  <organization>
+    <name>The Apache Software Foundation</name>
+    <url>http://jakarta.apache.org</url>
+    <logo>http://jakarta.apache.org/images/original-jakarta-logo.gif</logo>
+  </organization>
+
+  <licenses>
+	<license>
+    	<name>The Apache Software License, Version 2.0</name>
+    	<url>/LICENSE.txt</url>
+    	<distribution>repo</distribution>
+	</license>
+  </licenses>
+  
+  <gumpRepositoryId>jakarta</gumpRepositoryId>
+  <issueTrackingUrl>http://issues.apache.org/bugzilla/</issueTrackingUrl>
+  <siteAddress>jakarta.apache.org</siteAddress>
+  <siteDirectory>/www/jakarta.apache.org/commons/${pom.artifactId.substring(8)}/</siteDirectory>
+  <distributionDirectory>/www/jakarta.apache.org/builds/jakarta-commons/${pom.artifactId.substring(8)}/</distributionDirectory>
+  
+  <repository>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:jakarta-commons/${pom.artifactId.substring(8)}</connection>
+    <url>http://cvs.apache.org/viewcvs/jakarta-commons/${pom.artifactId.substring(8)}/</url>
+  </repository>
+  
+  <mailingLists>
+    <mailingList>
+      <name>Commons Dev List</name>
+      <subscribe>commons-dev-subscribe@jakarta.apache.org</subscribe>
+      <unsubscribe>commons-dev-unsubscribe@jakarta.apache.org</unsubscribe>
+      <archive>http://nagoya.apache.org/eyebrowse/SummarizeList?listName=commons-dev@jakarta.apache.org</archive>
+    </mailingList>
+    <mailingList>
+      <name>Commons User List</name>
+      <subscribe>commons-user-subscribe@jakarta.apache.org</subscribe>
+      <unsubscribe>commons-user-unsubscribe@jakarta.apache.org</unsubscribe>
+      <archive>http://nagoya.apache.org/eyebrowse/SummarizeList?listName=commons-user@jakarta.apache.org</archive>
+    </mailingList>
+  </mailingLists>
+
 
   <developers>
     <developer>
@@ -310,15 +346,41 @@ limitations under the License.
   </dependencies>
 
   <build>
-    <unitTest>
-      <includes>
-        <include>**/*TestSuite.java</include>
-      </includes>
-      <excludes>
-        <exclude>**/AllLangTestSuite.java</exclude>
-      </excludes>
-    </unitTest> 
-  </build>
+    	<nagEmailAddress>commons-dev@jakarta.apache.org</nagEmailAddress>
+    	<sourceDirectory>src/java</sourceDirectory>
+    	<unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+    	<integrationUnitTestSourceDirectory/>
+    	<aspectSourceDirectory/>
+
+    	<!-- Unit test classes -->
+    	<unitTest>
+      		<includes>
+        		<include>**/*TestSuite.java</include>
+      		</includes>
+      		<excludes>
+        		<exclude>**/AllLangTestSuite.java</exclude>
+      		</excludes>
+            <resources>
+                <resource>
+                    <directory>${pom.build.unitTestSourceDirectory}</directory>
+                    <includes>
+                        <include>**/*.xml</include>
+                    </includes>
+                </resource>
+            </resources>
+   		</unitTest>
+
+    	<!-- Integration unit test classes -->
+    	<integrationUnitTestPatterns></integrationUnitTestPatterns>
+    
+    	<resources>
+      		<includes>
+       			<include>**/*.properties</include>
+      		</includes>
+    	</resources>
+    	<jars/>
+  	</build>
+  	
   
   <reports>
      <!-- <report>maven-changelog-plugin</report> -->