diff --git a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/plugin.properties b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/plugin.properties
index 89062fd8a29..e11a3847403 100644
--- a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/plugin.properties
+++ b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/plugin.properties
@@ -191,8 +191,8 @@ Option.Optimize.Level5 = -O5
 Option.inlining = Function inlining
 Option.inlining.Q = inline all functions (-Q)
 Option.inlining.Qexclamation = diable inlining (-Q!)
-Option.Qplus = Specify functions to be inlined(-Q+=)
-Option.Qminus = Specify functions to not inline (-Q-=)
+Option.Qplus = Specify functions to be inlined(-Q+name1:name2:...:nameN)
+Option.Qminus = Specify functions to not inline (-Q-name1:name2:...:nameN)
 Option.aggrcopy = Enable destructive copy operations for structs and unions
 Option.aggrcopy.nooverlap=no overlap (-qaggrcopy=nooverlap)
 Option.aggrcopy.overlap=overlap (-qaggrcopy=overlap)
@@ -284,6 +284,7 @@ Option.Linker.Defname=DEF file name (-Wl,--output-def=)
 Option.linking.bundle = Create a bundle (-bundle)
 Option.linking.bundle_loader = Specify the name of bundle loader program (-bundle_loader=)
 Option.linking.f = Specify file containing a list of object files for the compiler to pass to the linker (-f)
+Option.linking.expfile = Save all the exported symbols in the designated file (-qexpfile=)
 
 #Archiver options
 Option.Archiver.Flags=Other archiver flags
@@ -309,7 +310,6 @@ Option.rndflt.zero = Zero
 Option.B = Determine substitute program path name (-B)
 Option.F = Specify alternate configuration file (-F)
 Option.t = Add prefix to designated programs (-t)
-Option.expfile = Save all the exported symbols in the designated file (-qexpfile=)
 Option.maxmem = Amount of memory used during optimization (-qmaxmem=)
 Option.path = Alternate program name for compiler components (-qpath=)
 Option.tls = Specify the thread local strorage model (-qtls=)
@@ -329,6 +329,11 @@ Option.attr.attr = Report attributes of only used identifiers(-qattr)
 Option.flag = Specify the minimum severity level of the diagnostic messages(-qflag=)
 Option.format = Warn of possible problems with string input and output format specifications (-qformat=)
 Option.halt = Instruct the compiler to stop after compilation if it encounters errors of specified severity or higher (-qhalt=)
+Option.halt.information = Information (-qhalt=i)
+Option.halt.warning = Warning (-qhalt=w)
+Option.halt.error = Error (-qhalt=e)
+Option.halt.severeError = Severe error (-qhalt=s)
+Option.halt.unrecoverableError = Unrecoverable error (-qhalt=u)
 Option.info = Produce informational messages (-qinfo= )
 Option.list = Produce a compiler listing that includes an object listing(-qlist)
 Option.listopt = Produce a compiler listing that displays all options in effect(-qlistopt)
diff --git a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/plugin.xml b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/plugin.xml
index bb28a1ab414..9bfb0ffcbb1 100644
--- a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/plugin.xml
+++ b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/plugin.xml
@@ -198,14 +198,14 @@
 			category="xlc.c.compiler.category.optimization"
 			command="-Q+="
 			id="xlc.c.compiler.option.optimization.Qplus"
-			valueType="stringList"> 
+			valueType="string"> 
 		</option>
 		<option
 			name="%Option.Qminus"
 			category="xlc.c.compiler.category.optimization"
 			command="-Q-="
 			id="xlc.c.compiler.option.optimization.Qminus"
-			valueType="stringList"> 
+			valueType="string"> 
 		</option>
 	  </tool>
 	  <tool
@@ -970,11 +970,11 @@
 		</option>
 		
 		<option
-			name="%Option.Keyword"
-			category="xlc.c.compiler.category.Input"
-			command="-qkeyword="
-			id="xlc.c.compiler.option.misc.keyword"
-			valueType="boolean"> 
+        category="xlc.c.compiler.category.Input"
+        command="-qkeyword="
+        id="xlc.c.compiler.option.misc.keyword"
+        name="%Option.Keyword"
+        valueType="boolean"> 
 		</option>
 
 		<option
@@ -2065,13 +2065,6 @@
 			id="xlc.c.compiler.option.cc.W"
 			valueType="string"> 
 		</option>
-		<option
-			name="%Option.expfile"
-			category="xlc.c.compiler.category.cc"
-			command="-qexpfile="
-			id="xlc.c.compiler.option.cc.expfile"
-			valueType="string"> 
-		</option>
 		<option
 			name="%Option.maxmem"
 			category="xlc.c.compiler.category.cc"
@@ -2080,11 +2073,12 @@
 			valueType="string"> 
 		</option>
 		<option
-			name="%Option.path"
-			category="xlc.c.compiler.category.cc"
-			command="-qpath="
-			id="xlc.c.compiler.option.cc.path"
-			valueType="string"> 
+        browseType="directory"
+        category="xlc.c.compiler.category.cc"
+        command="-qpath="
+        id="xlc.c.compiler.option.cc.path"
+        name="%Option.path"
+        valueType="string"> 
 		</option>
 		<option
 			name="%Option.tls"
@@ -2160,9 +2154,38 @@
 		<option
 			name="%Option.halt"
 			category="xlc.c.compiler.category.lm"
-			command="-qhalt="
 			id="xlc.c.compiler.option.lm.halt"
-			valueType="string"> 
+			valueType="enumerated">
+     <enumeratedOptionValue
+           id="org.eclipse.cdt.managedbuilder.xlc.ui.enumeratedOptionValue1"
+           isDefault="true"
+           name="%Option.default">
+     </enumeratedOptionValue>
+     <enumeratedOptionValue
+           command="-qhalt=i"
+           id="xlc.c.compiler.option.lm.halt.information"
+           name="%Option.halt.information">
+     </enumeratedOptionValue>
+     <enumeratedOptionValue
+           command="-qhalt=w"
+           id="xlc.c.compiler.option.lm.halt.warning"
+           name="%Option.halt.warning">
+     </enumeratedOptionValue>
+     <enumeratedOptionValue
+           command="-qhalt=e"
+           id="xlc.c.compiler.option.lm.halt.error"
+           name="%Option.halt.error">
+     </enumeratedOptionValue>
+     <enumeratedOptionValue
+           command="-qhalt=s"
+           id="xlc.c.compiler.option.lm.halt.severeError"
+           name="%Option.halt.severeError">
+     </enumeratedOptionValue>
+     <enumeratedOptionValue
+           command="-qhalt=u"
+           id="xlc.c.compiler.option.lm.halt.unrecoverableError"
+           name="%Option.halt.unrecoverableError">
+     </enumeratedOptionValue> 
 		</option>
 			
 		<option
@@ -2171,53 +2194,6 @@
 			command="-qinfo="
 			id="xlc.c.compiler.option.lm.info"
 			valueType="string"> 
-		</option>
-		 <option
-			name="%Option.langlvl"
-			category="xlc.c.compiler.category.lm"
-			id="xlc.c.compiler.option.lm.langlvl"
-			valueType="enumerated">
-			  <enumeratedOptionValue
-				  name="%Option.none"
-				  isDefault="false"
-				  id="xlc.c.input.langlvl.none">
-			  </enumeratedOptionValue>
-			  <enumeratedOptionValue
-				  name="%Option.langlvl.77std"
-				  isDefault="false"
-				  command="-qlanglvl=77std"
-				  id="xlc.c.input.langlvl.77std">
-			  </enumeratedOptionValue>
-			  <enumeratedOptionValue
-				  name="%Option.langlvl.90std"
-				  isDefault="false"
-				  command="-qlanglvl=90std"
-				  id="xlc.c.input.langlvl.90std">
-			  </enumeratedOptionValue>
-			  <enumeratedOptionValue
-				  name="%Option.langlvl.90pure"
-				  isDefault="false"
-				  command="-qlanglvl=90pure"
-				  id="xlc.c.input.langlvl.90pure">
-			  </enumeratedOptionValue>
-			  <enumeratedOptionValue
-				  name="%Option.langlvl.95std"
-				  isDefault="false"
-				  command="-qlanglvl=95std"
-				  id="xlc.c.input.langlvl.95std">
-			  </enumeratedOptionValue>
-			  <enumeratedOptionValue
-				  name="%Option.langlvl.95pure"
-				  isDefault="false"
-				  command="-qlanglvl=95pure"
-				  id="xlc.c.input.langlvl.95pure">
-			  </enumeratedOptionValue>
-			  <enumeratedOptionValue
-				  name="%Option.langlvl.extended"
-				  isDefault="false"
-				  command="-qlanglvl=extended"
-				  id="xlc.c.input.langlvl.extended">
-			  </enumeratedOptionValue>
 		</option>
 		<option
 			
@@ -2705,6 +2681,14 @@
 				id="xlc.c.compiler.option.linking.G"
 				valueType="boolean">
 			</option>
+			<option
+         browseType="file"
+         category="xlc.c.compiler.category.linking"
+         command="-qexpfile="
+         id="xlc.c.compiler.option.linking.expfile"
+         name="%Option.linking.expfile"
+         valueType="string"> 
+			</option>
 			<outputType
 				outputs="so"
 				outputPrefix="lib"