diff --git a/rse/plugins/org.eclipse.rse.importexport/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.importexport/META-INF/MANIFEST.MF
index 675f4b26521..85fc05b354a 100644
--- a/rse/plugins/org.eclipse.rse.importexport/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.importexport/META-INF/MANIFEST.MF
@@ -1,11 +1,23 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Importexport Plug-in
+Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.rse.importexport; singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 2.0.0
 Bundle-ClassPath: systemsImportExport.jar
 Bundle-Activator: org.eclipse.rse.importexport.RemoteImportExportPlugin
+Bundle-Vendor: Eclipse.org
 Bundle-Localization: plugin
-Export-Package: org.eclipse.rse.files.importexport,org.eclipse.rse.files.importexport.files,org.eclipse.rse.importexport
-Require-Bundle: org.eclipse.core.runtime,org.eclipse.core.resources,org.eclipse.ui,org.eclipse.ui.ide,org.eclipse.ui.views,org.eclipse.rse.services,org.eclipse.rse.core,org.eclipse.rse.ui,org.eclipse.rse.subsystems.files.core,org.eclipse.rse.files.ui
+Export-Package: org.eclipse.rse.files.importexport,
+ org.eclipse.rse.files.importexport.files,
+ org.eclipse.rse.importexport
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.ui,
+ org.eclipse.ui.ide,
+ org.eclipse.ui.views,
+ org.eclipse.rse.services,
+ org.eclipse.rse.core,
+ org.eclipse.rse.ui,
+ org.eclipse.rse.subsystems.files.core,
+ org.eclipse.rse.files.ui
 Eclipse-LazyStart: true
diff --git a/rse/plugins/org.eclipse.rse.importexport/plugin.xml b/rse/plugins/org.eclipse.rse.importexport/plugin.xml
index 0338b61d575..34ea93bc359 100644
--- a/rse/plugins/org.eclipse.rse.importexport/plugin.xml
+++ b/rse/plugins/org.eclipse.rse.importexport/plugin.xml
@@ -1,21 +1,129 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
+<?eclipse version="3.0"?>
 <plugin>
-
-   <extension
-         point="org.eclipse.ui.importWizards">
+   
+<!-- ========================================================================= -->
+<!-- Remote File System import and export wizards.                             -->
+<!-- ========================================================================= -->
+   <extension point="org.eclipse.ui.importWizards">
+      <wizard
+            name="%RemoteFileSystemImportWizard.label"
+            icon="icons/full/etool16/file_import.gif"
+            class="org.eclipse.rse.files.importexport.files.RemoteImportWizard"
+            id="org.eclipse.rse.files.importexport.fileImportWizard">
+         <description>
+            %RemoteFileSystemImportWizard.description
+         </description>
+         <selection
+               class="org.eclipse.core.resources.IResource">
+         </selection>
+      </wizard>
    </extension>
+   
    <extension
          point="org.eclipse.ui.popupMenus">
+      <objectContribution
+            objectClass="org.eclipse.core.resources.IResource"
+            nameFilter="*.rimpfd"
+            id="org.eclipse.rse.files.importexport.runFileImport">
+         <action
+               label="%RemoteFileImportAction.label"
+               tooltip="%RemoteFileImportAction.tooltip"
+               class="org.eclipse.rse.files.importexport.files.RemoteFileImportActionDelegate"
+               menubarPath="additions"
+               enablesFor="+"
+               id="importRemoteFiles">
+         </action>
+      </objectContribution>
+      <objectContribution
+            objectClass="org.eclipse.core.resources.IResource"
+            nameFilter="*.rimpfd"
+            id="org.eclipse.rse.files.importexport.openFileImport">
+         <action
+               label="%OpenRemoteFileImport.label"
+               tooltip="%OpenRemoteFileImport.tooltip"
+               class="org.eclipse.rse.files.importexport.files.RemoteFileOpenImportWizardActionDelegate"
+               menubarPath="additions"
+               enablesFor="1"
+               id="openRemoteFileImport">
+         </action>
+      </objectContribution>
    </extension>
+   
    <extension
          point="org.eclipse.ui.exportWizards">
+      <wizard
+            name="%RemoteFileSystemExportWizard.label"
+            icon="icons/full/etool16/file_export.gif" 
+            class="org.eclipse.rse.files.importexport.files.RemoteExportWizard"
+            id="org.eclipse.rse.files.importexport.fileExportWizard">
+         <description>
+            %RemoteFileSystemExportWizard.description
+         </description>
+         <selection
+               class="org.eclipse.core.resources.IResource">
+         </selection>
+      </wizard>
    </extension>
+   
    <extension
          point="org.eclipse.ui.popupMenus">
+      <objectContribution
+            objectClass="org.eclipse.core.resources.IResource"
+            nameFilter="*.rexpfd"
+            id="org.eclipse.rse.files.importexport.runFileExport">
+         <action
+               label="%RemoteFileExportAction.label"
+               tooltip="%RemoteFileExportAction.tooltip"
+               class="org.eclipse.rse.files.importexport.files.RemoteFileExportActionDelegate"
+               menubarPath="additions"
+               enablesFor="+"
+               id="exportRemoteFiles">
+         </action>
+      </objectContribution>
+      <objectContribution
+            objectClass="org.eclipse.core.resources.IResource"
+            nameFilter="*.rexpfd"
+            id="org.eclipse.rse.files.importexport.openFileExport">
+         <action
+               label="%OpenRemoteFileExport.label"
+               tooltip="%OpenRemoteFileExport.tooltip"
+               class="org.eclipse.rse.files.importexport.files.RemoteFileOpenExportWizardActionDelegate"
+               menubarPath="additions"
+               enablesFor="1"
+               id="openRemoteFileExport">
+         </action>
+      </objectContribution>
    </extension>
+   
    <extension
          point="org.eclipse.ui.popupMenus">
+      <objectContribution
+            objectClass="org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile"   
+            id="org.eclipse.rse.files.importexport.projectImportExport">
+         <filter
+               name="isDirectory"
+               value="true">
+         </filter>
+            
+         <action
+               label="%ImportToProject.label"
+               tooltip="%ImportToProject.tooltip"
+               class="org.eclipse.rse.files.importexport.files.RemoteFileImportToProjectActionDelegate"
+               menubarPath="group.importexport"
+               enablesFor="1"
+               id="importToProject">
+         </action>
+         
+         <action
+               label="%ExportFromProject.label"
+               tooltip="%ExportFromProject.tooltip"
+               class="org.eclipse.rse.files.importexport.files.RemoteFileExportFromProjectActionDelegate"
+               menubarPath="group.importexport"
+               enablesFor="1"
+               id="exportFromProject">
+         </action>
+      </objectContribution>
    </extension>
-
+   
 </plugin>