--- org.eclipse.egit.ui.importer/META-INF/MANIFEST.MF.orig	2016-05-01 09:14:00.444800194 +0100
+++ org.eclipse.egit.ui.importer/META-INF/MANIFEST.MF	2016-05-01 09:14:23.283474792 +0100
@@ -7,7 +7,7 @@
 Bundle-Vendor: %provider_name
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.e4.ui.importer;bundle-version="0.1.0",
+ org.eclipse.ui.ide;bundle-version="3.12.0",
  org.eclipse.jgit;bundle-version="[4.3.0,4.4.0)"
 Bundle-Localization: fragment
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
--- org.eclipse.egit.ui.importer/src/org/eclipse/egit/ui/internal/clone/EasymportGitWizard.java.orig	2016-05-01 09:32:38.813865600 +0100
+++ org.eclipse.egit.ui.importer/src/org/eclipse/egit/ui/internal/clone/EasymportGitWizard.java	2016-05-01 09:57:15.010837565 +0100
@@ -30,9 +30,9 @@
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.ui.IImportWizard;
 import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.internal.wizards.datatransfer.Activator;
-import org.eclipse.ui.internal.wizards.datatransfer.EasymportWizard;
-import org.eclipse.ui.internal.wizards.datatransfer.SelectImportRootWizardPage;
+import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;
+import org.eclipse.ui.internal.wizards.datatransfer.SmartImportWizard;
+import org.eclipse.ui.internal.wizards.datatransfer.SmartImportRootWizardPage;
 
 /**
  * Alternative Git clone wizard using auto import framework incubating in e4
@@ -40,7 +40,7 @@
 public class EasymportGitWizard extends AbstractGitCloneWizard
 		implements IImportWizard, IPageChangedListener {
 
-	private EasymportWizard easymportWizard;
+	private SmartImportWizard easymportWizard;
 	private GitSelectRepositoryPage selectRepoPage = new GitSelectRepositoryPage();
 
 	/**
@@ -50,11 +50,11 @@
 		super();
 		IDialogSettings dialogSettings = super.getDialogSettings();
 		if (dialogSettings == null) {
-			dialogSettings = Activator.getDefault().getDialogSettings();
+			dialogSettings = IDEWorkbenchPlugin.getDefault().getDialogSettings();
 			setDialogSettings(dialogSettings);
 		}
 		setDefaultPageImageDescriptor(UIIcons.WIZBAN_IMPORT_REPO);
-		this.easymportWizard = new EasymportWizard();
+		this.easymportWizard = new SmartImportWizard();
 	}
 
 	@Override
@@ -71,7 +71,7 @@
 
 	@Override
 	public boolean performFinish() {
-		return true; // delegated to EasymportWizard
+		return true; // delegated to SmartImportWizard
 	}
 
 	@Override
@@ -144,13 +144,13 @@
 
 	@Override
 	public void pageChanged(PageChangedEvent event) {
-		SelectImportRootWizardPage selectRootPage = (SelectImportRootWizardPage) this.easymportWizard.getPages()[0];
+		SmartImportRootWizardPage selectRootPage = (SmartImportRootWizardPage) this.easymportWizard.getPages()[0];
 		if (event.getSelectedPage() == selectRootPage) {
 			Repository existingRepo = selectRepoPage.getRepository();
 			if (existingRepo != null) {
-				selectRootPage.setInitialSelectedDirectory(existingRepo.getWorkTree());
+				selectRootPage.setInitialImportRoot(existingRepo.getWorkTree());
 			} else if (needToCloneRepository()) {
-				selectRootPage.setInitialSelectedDirectory(doClone());
+				selectRootPage.setInitialImportRoot(doClone());
 			}
 		}
 	}