diff --git a/com.microsoft.java.debug.plugin/META-INF/MANIFEST.MF b/com.microsoft.java.debug.plugin/META-INF/MANIFEST.MF
index 352226c0d..ae94cf91f 100644
--- a/com.microsoft.java.debug.plugin/META-INF/MANIFEST.MF
+++ b/com.microsoft.java.debug.plugin/META-INF/MANIFEST.MF
@@ -1,11 +1,12 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Debug
+Bundle-Name: Java Debug Server Plugin
 Bundle-SymbolicName: com.microsoft.java.debug.plugin;singleton:=true
 Bundle-Version: 0.10.0
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: com.microsoft.java.debug.plugin.internal.JavaDebuggerServerPlugin
+Bundle-Vendor: Microsoft
 Import-Package: org.eclipse.jdt.core,
  org.eclipse.jdt.launching,
  org.osgi.framework;version="1.3.0"
diff --git a/com.microsoft.java.debug.repository/category.xml b/com.microsoft.java.debug.repository/category.xml
new file mode 100644
index 000000000..eee24dad9
--- /dev/null
+++ b/com.microsoft.java.debug.repository/category.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+   <bundle id="com.microsoft.java.debug.plugin" version="0.10.0">
+   	<category name="javadebug" />
+   </bundle>
+   <category-def name="javadebug" label="Java Debug Server"/>
+</site>
\ No newline at end of file
diff --git a/com.microsoft.java.debug.repository/pom.xml b/com.microsoft.java.debug.repository/pom.xml
new file mode 100644
index 000000000..a9429a21c
--- /dev/null
+++ b/com.microsoft.java.debug.repository/pom.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.microsoft.java</groupId>
+        <artifactId>java-debug-parent</artifactId>
+        <version>0.10.0</version>
+    </parent>
+	<artifactId>com.microsoft.java.debug.repository</artifactId>
+	<packaging>eclipse-repository</packaging>
+	<name>${base.name} :: P2 Update site</name>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.eclipse.tycho</groupId>
+                <artifactId>tycho-maven-plugin</artifactId>
+                <version>${tycho-version}</version>
+                <extensions>true</extensions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 2609a362f..f43198e20 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,6 +59,7 @@
     <modules>
         <module>com.microsoft.java.debug.core</module>
         <module>com.microsoft.java.debug.plugin</module>
+        <module>com.microsoft.java.debug.repository</module>
     </modules>
     <build>
         <pluginManagement>