diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog
index 6af66f616be..3b4842aa0ef 100644
--- a/debug/org.eclipse.cdt.debug.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.core/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-09 Mikhail Khodjaiants
+	Bug 94139: User-defined register groups.
+	Don't save the list of registers for default groups.
+	* CRegisterManager.java
+
 2005-06-09 Mikhail Khodjaiants
 	Bug 94139: User-defined register groups.
 	Support fo the "Restore Default Register Groups" action.
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CRegisterManager.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CRegisterManager.java
index fe7ac771d54..5d6fcba95db 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CRegisterManager.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CRegisterManager.java
@@ -63,6 +63,8 @@ public class CRegisterManager {
 	 */
 	private IRegisterDescriptor[] fRegisterDescriptors;
 
+	private boolean fUseDefaultRegisterGroups = true;
+
 	/** 
 	 * Constructor for CRegisterManager. 
 	 */
@@ -235,9 +237,11 @@ public class CRegisterManager {
 			}
 			childNode = childNode.getNextSibling();
 		}
+		fUseDefaultRegisterGroups = false;
 	}
 
 	protected void initializeDefaults() {
+		fUseDefaultRegisterGroups = true;
 		String current = null;
 		int startIndex = 0;
 		for ( int i = 0; i < fRegisterDescriptors.length; ++i ) {
@@ -274,7 +278,7 @@ public class CRegisterManager {
 	}
 
 	private String getMemento() throws CoreException {
-		if ( fRegisterGroups == null )
+		if ( fUseDefaultRegisterGroups || fRegisterGroups == null )
 			return ""; //$NON-NLS-1$
 		Document document = DebugPlugin.newDocument();
 		Element element = document.createElement( ELEMENT_REGISTER_GROUP_LIST );