diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCLanguage.java b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCLanguage.java
index 08191fa99ff..5e7f9455681 100644
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCLanguage.java
+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCLanguage.java
@@ -55,7 +55,7 @@ public class XlcCLanguage extends GCCLanguage {
 	
 	@Override
 	protected IScannerExtensionConfiguration getScannerExtensionConfiguration() {
-		return XlcScannerExtensionConfiguration.getInstance();
+		return XlcCScannerExtensionConfiguration.getInstance();
 	}
 
 	
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCPPLanguage.java b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCPPLanguage.java
index 1712c92b4ac..950e2d4dd2f 100644
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCPPLanguage.java
+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCPPLanguage.java
@@ -82,7 +82,7 @@ public class XlcCPPLanguage extends GPPLanguage {
 	
 	@Override
 	protected IScannerExtensionConfiguration getScannerExtensionConfiguration() {
-		return XlcScannerExtensionConfiguration.getInstance();
+		return XlcCPPScannerExtensionConfiguration.getInstance();
 	}
 	
 	
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCPPScannerExtensionConfiguration.java b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCPPScannerExtensionConfiguration.java
new file mode 100644
index 00000000000..4c9c429e595
--- /dev/null
+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCPPScannerExtensionConfiguration.java
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright (c) 2009 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.cdt.core.lrparser.xlc;
+
+
+import org.eclipse.cdt.core.dom.parser.cpp.GPPScannerExtensionConfiguration;
+
+public class XlcCPPScannerExtensionConfiguration extends GPPScannerExtensionConfiguration {
+
+	private static XlcCPPScannerExtensionConfiguration instance;
+	
+	
+	private XlcCPPScannerExtensionConfiguration() {}
+	
+	public static synchronized XlcCPPScannerExtensionConfiguration getInstance() {
+		if(instance == null)
+			instance = new XlcCPPScannerExtensionConfiguration();
+		return instance;
+	}
+
+	@Override
+	public boolean supportUTFLiterals() {
+		return true;
+	}
+
+	@Override
+	public char[] supportAdditionalNumericLiteralSuffixes() {
+        return "dflij".toCharArray(); //$NON-NLS-1$
+    }
+}
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcScannerExtensionConfiguration.java b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCScannerExtensionConfiguration.java
similarity index 69%
rename from xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcScannerExtensionConfiguration.java
rename to xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCScannerExtensionConfiguration.java
index 632d7aa600d..d8feec6376b 100644
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcScannerExtensionConfiguration.java
+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCScannerExtensionConfiguration.java
@@ -12,16 +12,16 @@ package org.eclipse.cdt.core.lrparser.xlc;
 
 import org.eclipse.cdt.core.dom.parser.c.GCCScannerExtensionConfiguration;
 
-public class XlcScannerExtensionConfiguration extends GCCScannerExtensionConfiguration {
+public class XlcCScannerExtensionConfiguration extends GCCScannerExtensionConfiguration {
 
-	private static XlcScannerExtensionConfiguration instance;
+	private static XlcCScannerExtensionConfiguration instance;
 	
 	
-	private XlcScannerExtensionConfiguration() {}
+	private XlcCScannerExtensionConfiguration() {}
 	
-	public static synchronized XlcScannerExtensionConfiguration getInstance() {
+	public static synchronized XlcCScannerExtensionConfiguration getInstance() {
 		if(instance == null)
-			instance = new XlcScannerExtensionConfiguration();
+			instance = new XlcCScannerExtensionConfiguration();
 		return instance;
 	}
 
@@ -32,6 +32,6 @@ public class XlcScannerExtensionConfiguration extends GCCScannerExtensionConfigu
 
 	@Override
 	public char[] supportAdditionalNumericLiteralSuffixes() {
-        return "dfl".toCharArray(); //$NON-NLS-1$
+        return "dflij".toCharArray(); //$NON-NLS-1$
     }
 }
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcKeywords.java b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcKeywords.java
index 15661bd11d7..86e4acca281 100644
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcKeywords.java
+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcKeywords.java
@@ -78,7 +78,7 @@ public class XlcKeywords extends CLanguageKeywords {
 	
 
 	private XlcKeywords(ParserLanguage language) {
-		super(language, XlcScannerExtensionConfiguration.getInstance());
+		super(language, XlcCScannerExtensionConfiguration.getInstance());
 		this.language = language;
 	}
 	
@@ -93,7 +93,7 @@ public class XlcKeywords extends CLanguageKeywords {
 	@Override
 	public synchronized String[] getKeywords() {
 		if(allKeywords == null) {
-			ICLanguageKeywords base = new CLanguageKeywords(language, XlcScannerExtensionConfiguration.getInstance());
+			ICLanguageKeywords base = new CLanguageKeywords(language, XlcCScannerExtensionConfiguration.getInstance());
 			String[] baseKeywords = base.getKeywords();
 			
 			List<String> keywords = new ArrayList<String>();