diff --git a/pcep/api/pom.xml b/pcep/api/pom.xml
index a467c53..2926cbe 100644
--- a/pcep/api/pom.xml
+++ b/pcep/api/pom.xml
@@ -34,6 +34,10 @@
     <dependencies>
         <dependency>
             <groupId>org.onosproject</groupId>
+            <artifactId>onos-app-pcep-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.onosproject</groupId>
             <artifactId>onos-pcepio</artifactId>
         </dependency>
         <dependency>
diff --git a/pcep/ctl/pom.xml b/pcep/ctl/pom.xml
index 687ee06..0a872de 100644
--- a/pcep/ctl/pom.xml
+++ b/pcep/ctl/pom.xml
@@ -32,7 +32,6 @@
 
     <dependencies>
         <dependency>
-            <!-- FIXME once experimenter gets merged to upstream -->
             <groupId>org.onosproject</groupId>
             <artifactId>onos-pcep-controller-api</artifactId>
         </dependency>
diff --git a/pom.xml b/pom.xml
old mode 100755
new mode 100644
index fc1b672..30f4182
--- a/pom.xml
+++ b/pom.xml
@@ -410,6 +410,11 @@
             </dependency>
             <dependency>
                 <groupId>org.onosproject</groupId>
+                <artifactId>onos-app-pcep-api</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.onosproject</groupId>
                 <artifactId>onos-pcepio</artifactId>
                 <version>${project.version}</version>
             </dependency>
@@ -419,12 +424,6 @@
                 <artifactId>onos-pcep-controller-api</artifactId>
                 <version>${project.version}</version>
             </dependency>
-
-            <dependency>
-                <groupId>org.onosproject</groupId>
-                <artifactId>onos-app-pcep-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.onosproject</groupId>
                 <artifactId>onlab-thirdparty</artifactId>
@@ -439,6 +438,13 @@
                 <scope>test</scope>
             </dependency>
             <dependency>
+                <groupId>org.onosproject</groupId>
+                <artifactId>onos-pcep-controller-api</artifactId>
+                <version>${project.version}</version>
+                <classifier>tests</classifier>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
                 <groupId>commons-pool</groupId>
                 <artifactId>commons-pool</artifactId>
                 <version>1.6</version>
diff --git a/providers/pcep/app/app.xml b/providers/pcep/app/app.xml
index e5e3db0..ea3d1d1 100644
--- a/providers/pcep/app/app.xml
+++ b/providers/pcep/app/app.xml
@@ -19,6 +19,9 @@
      features="${project.artifactId}">
     <description>${project.description}</description>
     <artifact>mvn:${project.groupId}/onos-app-pcep-api/${project.version}</artifact>
+    <artifact>mvn:${project.groupId}/onos-pcepio/${project.version}</artifact>     
+    <artifact>mvn:${project.groupId}/onos-pcep-controller-api/${project.version}</artifact>     
+    <artifact>mvn:${project.groupId}/onos-pcep-controller-impl/${project.version}</artifact>
     <artifact>mvn:${project.groupId}/onos-pcep-provider-topology/${project.version}</artifact>
     <artifact>mvn:${project.groupId}/onos-pcep-provider-tunnel/${project.version}</artifact>
 </app>
diff --git a/providers/pcep/app/features.xml b/providers/pcep/app/features.xml
index 6557463..65a221b 100644
--- a/providers/pcep/app/features.xml
+++ b/providers/pcep/app/features.xml
@@ -20,6 +20,9 @@
              description="${project.description}">
         <feature>onos-api</feature>
         <bundle>mvn:${project.groupId}/onos-app-pcep-api/${project.version}</bundle>
+	<bundle>mvn:${project.groupId}/onos-pcepio/${project.version}</bundle>     
+        <bundle>mvn:${project.groupId}/onos-pcep-controller-api/${project.version}</bundle>     
+        <bundle>mvn:${project.groupId}/onos-pcep-controller-impl/${project.version}</bundle>
         <bundle>mvn:${project.groupId}/onos-pcep-provider-topology/${project.version}</bundle>
         <bundle>mvn:${project.groupId}/onos-pcep-provider-tunnel/${project.version}</bundle>
     </feature>
diff --git a/providers/pcep/app/pom.xml b/providers/pcep/app/pom.xml
index c8500a6..bce88d9 100644
--- a/providers/pcep/app/pom.xml
+++ b/providers/pcep/app/pom.xml
@@ -17,6 +17,21 @@
 			<groupId>org.onosproject</groupId>
 			<artifactId>onos-app-pcep-api</artifactId>
 		</dependency>
+                <dependency>
+			<groupId>org.onosproject</groupId>
+			<artifactId>onos-pcepio</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+                <dependency>
+			<groupId>org.onosproject</groupId>
+			<artifactId>onos-pcep-controller-api</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+                <dependency>
+			<groupId>org.onosproject</groupId>
+			<artifactId>onos-pcep-controller-impl</artifactId>
+			<version>${project.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.onosproject</groupId>
 			<artifactId>onos-pcep-provider-topology</artifactId>