diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeResources.properties b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeResources.properties
index 72c084dcf1d..3dc95168814 100644
--- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeResources.properties
+++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeResources.properties
@@ -116,10 +116,10 @@ BuildTargetDialog.button.build=Build
 BuildTargetDialog.title.makeTargetsFor=Make Targets for: 
 
 MakeTargetDialog.exception.noTargetBuilderOnProject=Not target builders on the project
-MakeTargetDialog.title.createMakeTarget=Create a new Make target.
-MakeTargetDialog.title.modifyMakeTarget=Modify a Make target,
+MakeTargetDialog.title.createMakeTarget=Create a new Make target
+MakeTargetDialog.title.modifyMakeTarget=Modify a Make target
 MakeTargetDialog.message.mustSpecifyName=Must specify a target name.
-MakeTargetDialog.message.targetWithNameExists=Target with that name already exits
+MakeTargetDialog.message.targetWithNameExists=Target with that name already exits.
 MakeTargetDialog.message.mustSpecifyBuildCommand=Must specify a build command
 MakeTargetDialog.button.update=Update
 MakeTargetDialog.button.create=Create
diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MessageLine.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MessageLine.java
index f839a812cc1..bc48c16c2f5 100644
--- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MessageLine.java
+++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MessageLine.java
@@ -22,6 +22,8 @@ public class MessageLine extends CLabel {
 
 	private Color fNormalMsgAreaBackground;
 
+	private boolean hasErrorMessage;
+
 	/**
 	 * Creates a new message line as a child of the given parent.
 	 */
@@ -44,10 +46,13 @@ public class MessageLine extends CLabel {
      */
 	public void setErrorMessage(String message) {
 		if (message != null && message.length() > 0) {
+			hasErrorMessage = true;
 			setText(message);
 			setImage(MakeUIImages.getImage(MakeUIImages.IMG_OBJS_ERROR));
 			setBackground(JFaceColors.getErrorBackground(getDisplay()));
 			return;
+		} else {
+			hasErrorMessage = false;
 		}
 		setText(fMessage);	
 		setImage(null);
@@ -58,4 +63,8 @@ public class MessageLine extends CLabel {
 		fMessage = message;
 		setText(message);
 	}
+	
+	public boolean hasErrorMessage() {
+		return hasErrorMessage;
+	}
 }
diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/MakeTargetDialog.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/MakeTargetDialog.java
index e5cdf6e377a..7b85b1a6906 100644
--- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/MakeTargetDialog.java
+++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/MakeTargetDialog.java
@@ -75,6 +75,7 @@ public class MakeTargetDialog extends Dialog {
 	private String targetName;
 	private String targetBuildID;
 	protected IMakeTarget fTarget;
+	private boolean initializing = true;
 
 	/**
 	 * @param parentShell
@@ -147,7 +148,7 @@ public class MakeTargetDialog extends Dialog {
 		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.widthHint = convertWidthInCharsToPixels(50);
 		fStatusLine.setLayoutData(gd);
-
+		initializing = false;
 		return composite;
 	}
 
@@ -167,21 +168,18 @@ public class MakeTargetDialog extends Dialog {
 				String newName = targetNameText.getText().trim();
 				if (newName.equals("")) { //$NON-NLS-1$
 					fStatusLine.setErrorMessage(MakeUIPlugin.getResourceString("MakeTargetDialog.message.mustSpecifyName")); //$NON-NLS-1$
-					getButton(IDialogConstants.OK_ID).setEnabled(false);
 				} else
 					try {
 						if (fTarget != null && fTarget.getName().equals(newName)
 								|| fTargetManager.findTarget(fContainer, newName) == null) {
 							fStatusLine.setErrorMessage(null);
-							getButton(IDialogConstants.OK_ID).setEnabled(true);
 						} else {
 							fStatusLine.setErrorMessage(MakeUIPlugin.getResourceString("MakeTargetDialog.message.targetWithNameExists")); //$NON-NLS-1$
-							getButton(IDialogConstants.OK_ID).setEnabled(false);
 						}
 					} catch (CoreException ex) {
 						fStatusLine.setErrorMessage(ex.getLocalizedMessage());
-						getButton(IDialogConstants.OK_ID).setEnabled(false);
 					}
+				updateButtons();
 			}
 		});
 	}
@@ -190,6 +188,13 @@ public class MakeTargetDialog extends Dialog {
 		Group group = ControlFactory.createGroup(parent, MakeUIPlugin.getResourceString(MAKE_SETTING_GROUP), 1);
 		stopOnErrorButton = new Button(group, SWT.CHECK);
 		stopOnErrorButton.setText(MakeUIPlugin.getResourceString(MAKE_SETTING_STOP_ERROR));
+		stopOnErrorButton.addSelectionListener(new SelectionAdapter() {
+
+			public void widgetSelected(SelectionEvent e) {
+				updateButtons();
+			}
+		});
+
 		if (isStopOnError) {
 			stopOnErrorButton.setSelection(true);
 		}
@@ -200,6 +205,12 @@ public class MakeTargetDialog extends Dialog {
 		}
 		runAllBuildersButton = new Button(group, SWT.CHECK);
 		runAllBuildersButton.setText(MakeUIPlugin.getResourceString("SettingsBlock.makeSetting.runAllBuilders")); //$NON-NLS-1$
+		runAllBuildersButton.addSelectionListener(new SelectionAdapter() {
+
+			public void widgetSelected(SelectionEvent e) {
+				updateButtons();
+			}
+		});
 		if (runAllBuilders) {
 			runAllBuildersButton.setSelection(true);
 		}
@@ -223,6 +234,7 @@ public class MakeTargetDialog extends Dialog {
 					commandText.setEnabled(true);
 					stopOnErrorButton.setEnabled(false);
 				}
+				updateButtons();
 			}
 		});
 		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -240,6 +252,7 @@ public class MakeTargetDialog extends Dialog {
 				if (commandText.getText().equals("")) { //$NON-NLS-1$
 					fStatusLine.setErrorMessage(MakeUIPlugin.getResourceString("MakeTargetDialog.message.mustSpecifyBuildCommand")); //$NON-NLS-1$
 				}
+				updateButtons();
 			}
 		});
 		if (buildCommand != null) {
@@ -275,6 +288,12 @@ public class MakeTargetDialog extends Dialog {
 		((GridData) (targetText.getLayoutData())).horizontalAlignment = GridData.FILL;
 		((GridData) (targetText.getLayoutData())).grabExcessHorizontalSpace = true;
 		targetText.setText(targetString);
+		targetText.addListener(SWT.Modify, new Listener() {
+
+			public void handleEvent(Event e) {
+				updateButtons();
+			}
+		});
 	}
 
 	protected void createButtonsForButtonBar(Composite parent) {
@@ -295,6 +314,34 @@ public class MakeTargetDialog extends Dialog {
 		targetNameText.selectAll();
 	}
 
+	protected void updateButtons() {
+		if (getButton(IDialogConstants.OK_ID) != null) {
+			getButton(IDialogConstants.OK_ID).setEnabled(targetHasChanged() && !fStatusLine.hasErrorMessage());
+		}
+	}
+
+	protected boolean targetHasChanged() {
+		if (initializing || fTarget == null)
+			return true;
+		if (isStopOnError != isStopOnError())
+			return true;
+		if (runAllBuilders != runAllBuilders())
+			return true;
+		if (isDefaultCommand != useDefaultBuildCmd())
+			return true;
+		if (!targetName.equals(getTargetName()))
+			return true;
+		if (!targetString.equals(getTarget()))
+			return true;
+		if (!isDefaultCommand) {
+			StringBuffer cmd = new StringBuffer(buildCommand.toOSString()).append(buildArguments);
+			if (!getBuildLine().equals(cmd.toString())) {
+				return true;
+			}
+		}
+		return false;
+	}
+
 	private String generateUniqueName(String targetString) {
 		String newName = targetString;
 		int i = 0;
@@ -329,11 +376,19 @@ public class MakeTargetDialog extends Dialog {
 		return null;
 	}
 
+	private String getTarget() {
+		return targetText.getText().trim();
+	}
+
+	private String getTargetName() {
+		return targetNameText.getText().trim();
+	}
+
 	protected void okPressed() {
 		IMakeTarget target = fTarget;
 		try {
 			if (fTarget == null) {
-				target = fTargetManager.createTarget(fContainer.getProject(), targetNameText.getText().trim(), targetBuildID);
+				target = fTargetManager.createTarget(fContainer.getProject(), getTargetName(), targetBuildID);
 			}
 			target.setStopOnError(isStopOnError());
 			target.setRunAllBuilders(runAllBuilders());
@@ -361,13 +416,13 @@ public class MakeTargetDialog extends Dialog {
 				}
 				target.setBuildArguments(args);
 			}
-			target.setBuildTarget(targetText.getText().trim());
+			target.setBuildTarget(getTarget());
 
 			if (fTarget == null) {
 				fTargetManager.addTarget(fContainer, target);
 			} else {
-				if (!target.getName().equals(targetNameText.getText().trim())) {
-					fTargetManager.renameTarget(target, targetNameText.getText().trim());
+				if (!target.getName().equals(getTargetName())) {
+					fTargetManager.renameTarget(target, getTargetName());
 				}
 			}
 		} catch (CoreException e) {