diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTests.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTests.java
index 55c4f1eaeb6..76534305924 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTests.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTests.java
@@ -1444,7 +1444,16 @@ public class CompletionTests extends AbstractContentAssistTest {
 		final String[] expected= { "foo;" };
 		assertCompletionResults(fCursorOffset, expected, REPLACEMENT);
 	}
-
+	
+	//	namespace N {
+	//		class waldo {};
+	//	}
+	//	using N::w/*cursor*/
+	public void testUsingDeclaration_509182() throws Exception {
+		final String[] expected = { "waldo;" };
+		assertCompletionResults(fCursorOffset, expected, REPLACEMENT);
+	}
+	
 	//	template <typen/*cursor*/
 	public void testTemplateDeclaration_397288() throws Exception {
 		final String[] expected= { "typename" };
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/DOMCompletionProposalComputer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/DOMCompletionProposalComputer.java
index 4b4faadc9f5..99b6f0394df 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/DOMCompletionProposalComputer.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/DOMCompletionProposalComputer.java
@@ -476,7 +476,11 @@ public class DOMCompletionProposalComputer extends ParsingBasedProposalComputer
 							getImage(classType), baseRelevance + relevance, context));
 				}
 			}
-			proposals.add(createProposal(classType.getName(), classType.getName(), getImage(classType),
+			StringBuilder repStringBuff = new StringBuilder(classType.getName());
+			if (context.isInUsingDirective() && !context.isFollowedBySemicolon()) {
+				repStringBuff.append(';');
+			}
+			proposals.add(createProposal(repStringBuff.toString(), classType.getName(), getImage(classType),
 					baseRelevance + RelevanceConstants.CLASS_TYPE_RELEVANCE, context));
 		}
 	}