diff --git a/bundles/org.eclipse.jst.jsp.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.jsp.ui/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..35922fb
--- /dev/null
+++ b/bundles/org.eclipse.jst.jsp.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,61 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.jst.jsp.ui; singleton:=true
+Bundle-Version: 1.0.0
+Bundle-ClassPath: jspeditor.jar
+Bundle-Activator: org.eclipse.jst.jsp.ui.internal.JSPUIPlugin
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Export-Package: org.eclipse.jst.jsp.ui.internal,
+ org.eclipse.jst.jsp.ui.internal.autoedit,
+ org.eclipse.jst.jsp.ui.internal.breakpointproviders,
+ org.eclipse.jst.jsp.ui.internal.contentassist,
+ org.eclipse.jst.jsp.ui.internal.editor,
+ org.eclipse.jst.jsp.ui.internal.format,
+ org.eclipse.jst.jsp.ui.internal.hyperlink,
+ org.eclipse.jst.jsp.ui.internal.java.refactoring,
+ org.eclipse.jst.jsp.ui.internal.java.search,
+ org.eclipse.jst.jsp.ui.internal.java.search.ui,
+ org.eclipse.jst.jsp.ui.internal.preferences,
+ org.eclipse.jst.jsp.ui.internal.preferences.ui,
+ org.eclipse.jst.jsp.ui.internal.projection,
+ org.eclipse.jst.jsp.ui.internal.provisional,
+ org.eclipse.jst.jsp.ui.internal.reconcile,
+ org.eclipse.jst.jsp.ui.internal.registry,
+ org.eclipse.jst.jsp.ui.internal.style,
+ org.eclipse.jst.jsp.ui.internal.style.java,
+ org.eclipse.jst.jsp.ui.internal.taginfo,
+ org.eclipse.jst.jsp.ui.internal.templates,
+ org.eclipse.jst.jsp.ui.internal.text,
+ org.eclipse.jst.jsp.ui.internal.views.contentoutline,
+ org.eclipse.jst.jsp.ui.internal.wizard
+Require-Bundle: org.eclipse.ui.ide,
+ org.eclipse.ui.views,
+ org.eclipse.jface.text,
+ org.eclipse.ui.workbench.texteditor,
+ org.eclipse.ui.editors,
+ org.eclipse.ui,
+ org.eclipse.wst.sse.ui,
+ org.eclipse.wst.html.ui,
+ org.eclipse.wst.css.ui,
+ org.eclipse.wst.xml.ui,
+ org.eclipse.jst.jsp.core,
+ org.eclipse.wst.html.core,
+ org.eclipse.wst.css.core,
+ org.eclipse.wst.xml.core,
+ org.eclipse.wst.xml.uriresolver,
+ org.eclipse.wst.sse.core,
+ org.eclipse.jdt.ui,
+ org.eclipse.jdt.core,
+ org.eclipse.debug.core,
+ org.eclipse.jdt.debug,
+ org.eclipse.core.resources,
+ org.eclipse.core.runtime,
+ org.eclipse.search,
+ org.eclipse.ltk.core.refactoring,
+ org.eclipse.ltk.ui.refactoring,
+ org.eclipse.wst.common.uriresolver,
+ org.eclipse.ui.ide,
+ org.eclipse.wst.javascript.ui
+Eclipse-AutoStart: true
diff --git a/bundles/org.eclipse.jst.jsp.ui/build.properties b/bundles/org.eclipse.jst.jsp.ui/build.properties
index cca182e..42eecf1 100644
--- a/bundles/org.eclipse.jst.jsp.ui/build.properties
+++ b/bundles/org.eclipse.jst.jsp.ui/build.properties
@@ -14,7 +14,8 @@
                jspeditor.jar,\
                icons/,\
                plugin.properties,\
-               templates/
+               templates/,\
+               META-INF/
 src.includes = plugin.xml,\
                plugin.properties,\
                icons/,\
diff --git a/bundles/org.eclipse.jst.jsp.ui/plugin.xml b/bundles/org.eclipse.jst.jsp.ui/plugin.xml
index 4cd4b9c..1dcccf2 100644
--- a/bundles/org.eclipse.jst.jsp.ui/plugin.xml
+++ b/bundles/org.eclipse.jst.jsp.ui/plugin.xml
@@ -1,47 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<plugin id="org.eclipse.jst.jsp.ui" 
-	name="%pluginName" version="1.0.0"
-	provider-name="%providerName"
-	class="org.eclipse.jst.jsp.ui.internal.JSPUIPlugin">
+<plugin>
 
-	<runtime>
-		<library name="jspeditor.jar">
-			<export name="*" />
-		</library>
-	</runtime>
-	<requires>
-		<import plugin="org.eclipse.ui.ide" />
-		<import plugin="org.eclipse.ui.views" />
-		<import plugin="org.eclipse.jface.text" />
-		<import plugin="org.eclipse.ui.workbench.texteditor" />
-		<import plugin="org.eclipse.ui.editors" />
-		<import plugin="org.eclipse.ui" />
-		<import plugin="org.eclipse.wst.sse.ui" />
-		<import plugin="org.eclipse.wst.html.ui" />
-		<import plugin="org.eclipse.wst.css.ui" />
-		<import plugin="org.eclipse.wst.xml.ui" />
-		<import plugin="org.eclipse.jst.jsp.core" />
-		<import plugin="org.eclipse.wst.html.core" />
-		<import plugin="org.eclipse.wst.css.core" />
-		<import plugin="org.eclipse.wst.xml.core" />
-		<import plugin="org.eclipse.wst.xml.uriresolver" />
-		<import plugin="org.eclipse.wst.sse.core" />
-		<import plugin="org.eclipse.jdt.ui" />
-		<import plugin="org.eclipse.jdt.core" />
-		<import plugin="org.eclipse.debug.core" />
-		<import plugin="org.eclipse.jdt.debug" />
-		<import plugin="org.eclipse.core.resources" />
-		<import plugin="org.eclipse.core.runtime" />
-		<import plugin="org.eclipse.search" />
-		<import plugin="org.eclipse.ltk.core.refactoring" />
-		<import plugin="org.eclipse.ltk.ui.refactoring" />
-		<import plugin="org.eclipse.wst.common.uriresolver"/>
-		<import plugin="org.eclipse.ui.ide" />
-  		<import plugin="org.eclipse.wst.javascript.ui"/>
-	</requires>
-
-	<extension point="org.eclipse.ui.editors">
+			<extension point="org.eclipse.ui.editors">
 		<editor name="%JSP_Source_Page_Editor.name"
 			icon="icons/sourceEditor.gif" extensions="jsp, jsf, jspf, jspx, tag, tagf"
 			contributorClass="org.eclipse.jst.jsp.ui.internal.editor.ActionContributorJSP"