diff --git a/bundles/org.eclipse.launchbar.remote.core/pom.xml b/bundles/org.eclipse.launchbar.remote.core/pom.xml
new file mode 100644
index 00000000000..a02aca3e5f3
--- /dev/null
+++ b/bundles/org.eclipse.launchbar.remote.core/pom.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.eclipse.launchbar</groupId>
+		<artifactId>parent</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+		<relativePath>../../pom.xml</relativePath>
+	</parent>
+
+	<artifactId>org.eclipse.launchbar.remote.core</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
+
+	<packaging>eclipse-plugin</packaging>
+</project>
diff --git a/features/org.eclipse.launchbar.remote/.project b/features/org.eclipse.launchbar.remote/.project
new file mode 100644
index 00000000000..d9d66858d17
--- /dev/null
+++ b/features/org.eclipse.launchbar.remote/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.launchbar.remote-feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/features/org.eclipse.launchbar.remote/build.properties b/features/org.eclipse.launchbar.remote/build.properties
new file mode 100644
index 00000000000..64f93a9f0b7
--- /dev/null
+++ b/features/org.eclipse.launchbar.remote/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff --git a/features/org.eclipse.launchbar.remote/feature.properties b/features/org.eclipse.launchbar.remote/feature.properties
new file mode 100644
index 00000000000..8ec49e9a8a8
--- /dev/null
+++ b/features/org.eclipse.launchbar.remote/feature.properties
@@ -0,0 +1,33 @@
+###############################################################################
+#  Copyright (c) 2005, 2010 IBM Corporation and others.
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+# 
+#  Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
+# features.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Remote Launch Targets
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse CDT
+
+# "description" property - description of the feature
+description=Support for IRemoteConnections as ILaunchTargets
+
+# copyright
+copyright=\
+Copyright (c) 2015 QNX Software Systems and others\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+which accompanies this distribution, and is available at\n\
+http://www.eclipse.org/legal/epl-v10.html
+
diff --git a/features/org.eclipse.launchbar.remote/feature.xml b/features/org.eclipse.launchbar.remote/feature.xml
new file mode 100644
index 00000000000..988d9acc32c
--- /dev/null
+++ b/features/org.eclipse.launchbar.remote/feature.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.launchbar.remote"
+      label="Remote Launch Targets"
+      version="1.0.0.qualifier"
+      provider-name="Eclipse CDT"
+      license-feature="org.eclipse.license"
+      license-feature-version="0.0.0">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <plugin
+         id="org.eclipse.launchbar.remote.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/features/org.eclipse.launchbar.remote/pom.xml b/features/org.eclipse.launchbar.remote/pom.xml
new file mode 100644
index 00000000000..e2879f4a5fd
--- /dev/null
+++ b/features/org.eclipse.launchbar.remote/pom.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.eclipse.launchbar</groupId>
+		<artifactId>parent</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+		<relativePath>../../pom.xml</relativePath>
+	</parent>
+
+	<groupId>org.eclipse.launchbar.features</groupId>
+	<artifactId>org.eclipse.launchbar.remote</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
+
+	<packaging>eclipse-feature</packaging>
+</project>
diff --git a/features/org.eclipse.launchbar/feature.xml b/features/org.eclipse.launchbar/feature.xml
index 5e8f84c18df..b985d758bfe 100644
--- a/features/org.eclipse.launchbar/feature.xml
+++ b/features/org.eclipse.launchbar/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.launchbar"
       label="%featureName"
-      version="1.0.1.qualifier"
+      version="2.0.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.launchbar/pom.xml b/features/org.eclipse.launchbar/pom.xml
index 6591751cf0d..cd2f48216b4 100644
--- a/features/org.eclipse.launchbar/pom.xml
+++ b/features/org.eclipse.launchbar/pom.xml
@@ -13,7 +13,7 @@
 
 	<groupId>org.eclipse.launchbar.features</groupId>
 	<artifactId>org.eclipse.launchbar</artifactId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/pom.xml b/pom.xml
index ee3c80c5ffe..937ef731652 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,6 +70,10 @@
 		<module>bundles/org.eclipse.launchbar.ui</module>
 		<module>features/org.eclipse.launchbar</module>
 		<module>tests/org.eclipse.launchbar.core.tests</module>
+		
+		<module>bundles/org.eclipse.launchbar.remote.core</module>
+		<module>features/org.eclipse.launchbar.remote</module>
+		
 		<module>repo</module>
 	</modules>
 
diff --git a/repo/category.xml b/repo/category.xml
index 348ed2527d8..2407cc4dc13 100644
--- a/repo/category.xml
+++ b/repo/category.xml
@@ -3,5 +3,8 @@
    <feature id="org.eclipse.launchbar">
       <category name="main"/>
    </feature>
+   <feature id="org.eclipse.launchbar.remote">
+      <category name="main"/>
+   </feature>
    <category-def name="main" label="LaunchBar"/>
 </site>