diff --git a/CHANGES.md b/CHANGES.md
index e107fcef..3f17b724 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,11 @@
 # Change Log
 
+## 0.5-M6
+
+This milestone adds a field in the DDMS preference page for selecting the debug port.
+
+* [489253](https://bugs.eclipse.org/bugs/show_bug.cgi?id=489253) Add Preference Page Entry for Selected Debug Port
+
 ## 0.5-M5
 
 This milestone fixes the Signing and Keys view and provides it as a separate installable feature on the update site.
diff --git a/android-core/plugins/org.eclipse.andmore.ddms/src/org/eclipse/andmore/ddms/i18n/Messages.java b/android-core/plugins/org.eclipse.andmore.ddms/src/org/eclipse/andmore/ddms/i18n/Messages.java
index 96c627ba..850bd8ee 100644
--- a/android-core/plugins/org.eclipse.andmore.ddms/src/org/eclipse/andmore/ddms/i18n/Messages.java
+++ b/android-core/plugins/org.eclipse.andmore.ddms/src/org/eclipse/andmore/ddms/i18n/Messages.java
@@ -96,6 +96,7 @@ public class Messages extends NLS {
 	public static String PreferencePage_Adbhost_value;
 	public static String PreferencePage_Assert;
 	public static String PreferencePage_Base_Local_Debugger_Port;
+	public static String PreferencePage_Selected_Debugger_Port;
 	public static String PreferencePage_Debug;
 	public static String PreferencePage_Error;
 	public static String PreferencePage_Heap_Updates_Enabled_Default;
diff --git a/android-core/plugins/org.eclipse.andmore.ddms/src/org/eclipse/andmore/ddms/i18n/messages.properties b/android-core/plugins/org.eclipse.andmore.ddms/src/org/eclipse/andmore/ddms/i18n/messages.properties
index 3698ebce..99b2e222 100644
--- a/android-core/plugins/org.eclipse.andmore.ddms/src/org/eclipse/andmore/ddms/i18n/messages.properties
+++ b/android-core/plugins/org.eclipse.andmore.ddms/src/org/eclipse/andmore/ddms/i18n/messages.properties
@@ -98,6 +98,7 @@ PreferencePage_Info=Info
 PreferencePage_Logging_Level=Logging Level
 PreferencePage_Open_Eclipse=Open in Eclipse
 PreferencePage_Save_Disk=Save to disk
+PreferencePage_Selected_Debugger_Port=Selected debug port
 PreferencePage_Thread_Status_Refresh_Interval=Thread status refresh interval (seconds):
 PreferencePage_Thread_Updates_Enabled_By_Default=Thread updates enabled by default
 PreferencePage_Use_Adbhost=Use ADBHOST
diff --git a/android-core/plugins/org.eclipse.andmore.ddms/src/org/eclipse/andmore/ddms/preferences/PreferencePage.java b/android-core/plugins/org.eclipse.andmore.ddms/src/org/eclipse/andmore/ddms/preferences/PreferencePage.java
index 55b99200..a82c4613 100644
--- a/android-core/plugins/org.eclipse.andmore.ddms/src/org/eclipse/andmore/ddms/preferences/PreferencePage.java
+++ b/android-core/plugins/org.eclipse.andmore.ddms/src/org/eclipse/andmore/ddms/preferences/PreferencePage.java
@@ -58,6 +58,11 @@ public void createFieldEditors() {
 		ife.setValidRange(1024, 32767);
 		addField(ife);
 
+		ife = new IntegerFieldEditor(PreferenceInitializer.ATTR_SELECTED_DEBUG_PORT,
+				Messages.PreferencePage_Selected_Debugger_Port, getFieldEditorParent());
+		ife.setValidRange(1024, 32767);
+		addField(ife);
+
 		BooleanFieldEditor bfe;
 
 		bfe = new BooleanFieldEditor(PreferenceInitializer.ATTR_DEFAULT_THREAD_UPDATE,