diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index cfe60356355..5d6edfc092d 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2009-08-24  Keith Seitz  <keiths@redhat.com>
+
+	* symtab.c (default_make_symbol_completion_list): Keep
+	':', too, so that we can limit searches in namespaces
+	and classes. 
+
 2009-08-24  Tom Tromey  <tromey@redhat.com>
 
 	* python/python-value.c (valpy_richcompare): Don't return from
diff --git a/gdb/symtab.c b/gdb/symtab.c
index c88156a0f3d..8d9d72c865a 100644
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -3836,7 +3836,8 @@ default_make_symbol_completion_list (char *text, char *word)
 	   which are in symbols.  */
 	while (p > text)
 	  {
-	    if (isalnum (p[-1]) || p[-1] == '_' || p[-1] == '\0')
+	    if (isalnum (p[-1]) || p[-1] == '_' || p[-1] == '\0'
+		|| p[-1] == ':')
 	      --p;
 	    else
 	      break;