diff --git a/plugins/org.eclipse.compare/META-INF/MANIFEST.MF b/plugins/org.eclipse.compare/META-INF/MANIFEST.MF
index 399e232..da375d8 100644
--- a/plugins/org.eclipse.compare/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.compare/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Export-Package: org.eclipse.compare,
  org.eclipse.compare.contentmergeviewer,
  org.eclipse.compare.internal;x-internal:=true,
  org.eclipse.compare.internal.merge;x-internal:=true,
- org.eclipse.compare.internal.patch;x-internal:=true,
+ org.eclipse.compare.internal.patch;x-friends:="org.eclipse.team.ui",
  org.eclipse.compare.patch,
  org.eclipse.compare.structuremergeviewer
 Require-Bundle: org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
diff --git a/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java b/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java
index 9b51fb3..efe7e63 100644
--- a/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java
+++ b/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java
@@ -71,7 +71,7 @@ import org.eclipse.ui.views.navigator.ResourceComparator;
 
 import com.ibm.icu.text.MessageFormat;
 
-/* package */ class InputPatchPage extends WizardPage {
+public class InputPatchPage extends WizardPage {
 
 	// constants
 	protected static final int SIZING_TEXT_FIELD_WIDTH= 250;
@@ -124,7 +124,7 @@ import com.ibm.icu.text.MessageFormat;
 		}
 	}
 	
-	InputPatchPage(PatchWizard pw) {
+	public InputPatchPage(PatchWizard pw) {
 		super(INPUTPATCHPAGE_NAME, PatchMessages.InputPatchPage_title, null);
 		fPatchWizard= pw;
 		setMessage(PatchMessages.InputPatchPage_message);
@@ -206,7 +206,10 @@ import com.ibm.icu.text.MessageFormat;
 		// all of the projects that make up the patch and continue on to final preview page 
 		// else go on to target selection page
 		if (patcher.isWorkspacePatch()) {
-			return fPatchWizard.getPage(PreviewPatchPage2.PREVIEWPATCHPAGE_NAME);
+			// skip 'Patch Target' page
+			IWizardPage page = super.getNextPage();
+			if (page.getName().equals(PatchTargetPage.PATCHTARGETPAGE_NAME))
+				return page.getNextPage();
 		}
 
 		return super.getNextPage();
diff --git a/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchTargetPage.java b/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchTargetPage.java
index ccca2d3..8fd95d7 100644
--- a/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchTargetPage.java
+++ b/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchTargetPage.java
@@ -12,18 +12,31 @@ package org.eclipse.compare.internal.patch;
 
 import org.eclipse.compare.internal.ICompareContextIds;
 import org.eclipse.compare.internal.Utilities;
-import org.eclipse.core.resources.*;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.*;
+import org.eclipse.jface.viewers.DoubleClickEvent;
+import org.eclipse.jface.viewers.IDoubleClickListener;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.wizard.IWizardPage;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.swt.widgets.Tree;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.model.WorkbenchContentProvider;
 import org.eclipse.ui.model.WorkbenchLabelProvider;
@@ -48,7 +61,7 @@ public class PatchTargetPage extends WizardPage {
 
 	protected final static String PATCHTARGETPAGE_NAME = "PatchTargetPage"; //$NON-NLS-1$
 
-	PatchTargetPage(WorkspacePatcher patcher) {
+	public PatchTargetPage(WorkspacePatcher patcher) {
 		super(PATCHTARGETPAGE_NAME, PatchMessages.PatchTargetPage_title, null);
 		setMessage(PatchMessages.PatchTargetPage_message);
 		fPatcher = patcher;
diff --git a/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchWizard.java b/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchWizard.java
index fa19443..9b97735 100644
--- a/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchWizard.java
+++ b/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchWizard.java
@@ -40,9 +40,9 @@ public class PatchWizard extends Wizard {
 
 	private boolean fHasNewDialogSettings;
 	
-	private InputPatchPage fPatchWizardPage;
-	private PatchTargetPage fPatchTargetPage;
-	private PreviewPatchPage2 fPreviewPage2;
+	protected InputPatchPage fPatchWizardPage;
+	protected PatchTargetPage fPatchTargetPage;
+	protected PreviewPatchPage2 fPreviewPage2;
 	
 	private final WorkspacePatcher fPatcher;
 	
@@ -86,15 +86,18 @@ public class PatchWizard extends Wizard {
 		}
 	}
 
-	WorkspacePatcher getPatcher() {
+	protected WorkspacePatcher getPatcher() {
 		return fPatcher;
 	}
-	
+
+	protected IStorage getPatch() {
+		return patch;
+	}
+
 	IResource getTarget() {
 		return fPatcher.getTarget();
 	}
 	
-	
 	/* (non-Javadoc)
 	 * Method declared on IWizard.
 	 */