diff --git a/bundles/org.eclipse.equinox.p2.transport.ecf/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.equinox.p2.transport.ecf/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000000..5faf08b7d5
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.transport.ecf/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,7 @@
+dsVersion=V1_4
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=error
diff --git a/bundles/org.eclipse.equinox.p2.transport.ecf/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.transport.ecf/META-INF/MANIFEST.MF
index 85cea909d2..f06c296255 100644
--- a/bundles/org.eclipse.equinox.p2.transport.ecf/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.transport.ecf/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.ecf;bundle-version="3.1.0",
  org.eclipse.equinox.p2.repository;bundle-version="2.1.0",
  org.eclipse.equinox.common;bundle-version="3.6.0",
  org.eclipse.core.jobs;bundle-version="3.5.100"
-Service-Component: OSGI-INF/ecfTransport.xml
+Service-Component: OSGI-INF/org.eclipse.equinox.p2.transport.ecf.xml
 Bundle-Activator: org.eclipse.equinox.internal.p2.transport.ecf.Activator
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.equinox.internal.p2.transport.ecf;x-friends:="org.eclipse.equinox.p2.discovery.compatibility,org.eclipse.equinox.p2.installer"
diff --git a/bundles/org.eclipse.equinox.p2.transport.ecf/OSGI-INF/.gitignore b/bundles/org.eclipse.equinox.p2.transport.ecf/OSGI-INF/.gitignore
new file mode 100644
index 0000000000..b878e882ac
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.transport.ecf/OSGI-INF/.gitignore
@@ -0,0 +1 @@
+/*.xml
diff --git a/bundles/org.eclipse.equinox.p2.transport.ecf/OSGI-INF/ecfTransport.xml b/bundles/org.eclipse.equinox.p2.transport.ecf/OSGI-INF/ecfTransport.xml
deleted file mode 100644
index f9a41cc3ec..0000000000
--- a/bundles/org.eclipse.equinox.p2.transport.ecf/OSGI-INF/ecfTransport.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.equinox.p2.transport.ecf">
-   <implementation class="org.eclipse.equinox.internal.p2.transport.ecf.ECFTransportComponent"/>
-   <service>
-      <provide interface="org.eclipse.equinox.p2.core.spi.IAgentServiceFactory"/>
-   </service>
-   <property name="p2.agent.servicename" type="String" value="org.eclipse.equinox.internal.p2.repository.Transport"/>
-</scr:component>
diff --git a/bundles/org.eclipse.equinox.p2.transport.ecf/src/org/eclipse/equinox/internal/p2/transport/ecf/ECFTransportComponent.java b/bundles/org.eclipse.equinox.p2.transport.ecf/src/org/eclipse/equinox/internal/p2/transport/ecf/ECFTransportComponent.java
index e195f21096..222f9083a1 100644
--- a/bundles/org.eclipse.equinox.p2.transport.ecf/src/org/eclipse/equinox/internal/p2/transport/ecf/ECFTransportComponent.java
+++ b/bundles/org.eclipse.equinox.p2.transport.ecf/src/org/eclipse/equinox/internal/p2/transport/ecf/ECFTransportComponent.java
@@ -13,9 +13,14 @@
  *******************************************************************************/
 package org.eclipse.equinox.internal.p2.transport.ecf;
 
+import org.eclipse.equinox.internal.p2.repository.Transport;
 import org.eclipse.equinox.p2.core.IProvisioningAgent;
+import org.eclipse.equinox.p2.core.spi.AgentServiceName;
 import org.eclipse.equinox.p2.core.spi.IAgentServiceFactory;
+import org.osgi.service.component.annotations.Component;
 
+@Component(name = "org.eclipse.equinox.p2.transport.ecf")
+@AgentServiceName(Transport.class)
 public class ECFTransportComponent implements IAgentServiceFactory {
 
 	@Override