diff --git a/com.ibm.wala-feature/feature.xml b/com.ibm.wala-feature/feature.xml
index 93767740a..19c105f0c 100644
--- a/com.ibm.wala-feature/feature.xml
+++ b/com.ibm.wala-feature/feature.xml
@@ -5,14 +5,6 @@
       version="1.3.4.qualifier"
       provider-name="%providerName">
 
-   <copyright url="%copyrightURL">
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
    <plugin
          id="com.ibm.wala.core"
          download-size="0"
diff --git a/com.ibm.wala-repository/category.xml b/com.ibm.wala-repository/category.xml
index 1413a77af..091568633 100644
--- a/com.ibm.wala-repository/category.xml
+++ b/com.ibm.wala-repository/category.xml
@@ -3,6 +3,9 @@
     <feature id="com.ibm.wala-feature">
         <category name="main"/>
     </feature>
+    <feature id="com.ibm.wala-feature.source">
+        <category name="main"/>
+    </feature>
     <feature id="com.ibm.wala.ide-feature">
         <category name="main"/>
     </feature>
diff --git a/com.ibm.wala.ide-feature/feature.xml b/com.ibm.wala.ide-feature/feature.xml
index 112c2234c..a75f8f86a 100644
--- a/com.ibm.wala.ide-feature/feature.xml
+++ b/com.ibm.wala.ide-feature/feature.xml
@@ -5,14 +5,6 @@
       version="1.3.4.qualifier"
       provider-name="%providerName">
 
-   <copyright url="%copyrightURL">
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
    <plugin
          id="com.ibm.wala.ide"
          download-size="0"
diff --git a/com.ibm.wala.tests-feature/feature.xml b/com.ibm.wala.tests-feature/feature.xml
index 0c21a45bc..24899dee3 100644
--- a/com.ibm.wala.tests-feature/feature.xml
+++ b/com.ibm.wala.tests-feature/feature.xml
@@ -5,14 +5,6 @@
       version="1.3.4.qualifier"
       provider-name="%providerName">
 
-   <copyright url="%copyrightURL">
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
    <plugin
          id="com.ibm.wala.cast.java.test"
          download-size="0"
diff --git a/com.ibm.wala.tests.ide-feature/feature.xml b/com.ibm.wala.tests.ide-feature/feature.xml
index c9098793f..59dc0eab2 100644
--- a/com.ibm.wala.tests.ide-feature/feature.xml
+++ b/com.ibm.wala.tests.ide-feature/feature.xml
@@ -5,14 +5,6 @@
       version="1.3.4.qualifier"
       provider-name="%providerName">
 
-   <copyright url="%copyrightURL">
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
    <plugin
          id="com.ibm.wala.ide.tests"
          download-size="0"
diff --git a/pom.xml b/pom.xml
index 7e940677e..406f73029 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 		<project-version>1.3.4-SNAPSHOT</project-version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<build-alias>b000</build-alias>
-		<tycho-version>0.17.0</tycho-version>
+		<tycho-version>0.18.0</tycho-version>
 		<tycho.scmUrl>scm:git:ssh://github.com:wala/WALA.git</tycho.scmUrl>
 	</properties>
 
@@ -112,10 +112,41 @@
 					<argLine>${tycho.test.jvmArgs}</argLine>
 				</configuration>
 			</plugin>
+			<!-- The tycho-source-feature-plugin needs to be place before the tycho-p2-plugin, as both plugins' goals bind to the same phase -->
+			<plugin>
+				<groupId>org.eclipse.tycho.extras</groupId>
+				<artifactId>tycho-source-feature-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<executions>
+					<execution>
+						<id>generate-source-feature</id>
+						<goals>
+							<goal>source-feature</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-p2-plugin</artifactId>
 				<version>${tycho-version}</version>
+				<executions>
+					<execution>
+						<!-- Don't attach (default) metadata before the "generate-source-feature" execution. -->
+						<id>default-p2-metadata-default</id>
+						<configuration>
+							<attachP2Metadata>false</attachP2Metadata>
+						</configuration>
+					</execution>
+					<execution>
+						<!-- Do attach metadata after the "generate-source-feature" execution. -->
+						<id>attach-p2-metadata</id>
+						<phase>package</phase>
+						<goals>
+							<goal>p2-metadata</goal>
+						</goals>
+					</execution>
+				</executions>
 			</plugin>
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
@@ -130,11 +161,6 @@
 					<includeAllDependencies>false</includeAllDependencies>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.eclipse.tycho.extras</groupId>
-				<artifactId>tycho-source-feature-plugin</artifactId>
-				<version>${tycho-version}</version>
-			</plugin>
 			<plugin>
 				<groupId>com.googlecode.maven-download-plugin</groupId>
 				<artifactId>maven-download-plugin</artifactId>