diff --git a/tcl/board/ek-lm3s811.cfg b/tcl/board/ek-lm3s811.cfg
new file mode 100644
index 000000000..d3f93d061
--- /dev/null
+++ b/tcl/board/ek-lm3s811.cfg
@@ -0,0 +1,19 @@
+#
+# TI/Luminary Stellaris LM3S811 Evaluation Kits
+#
+# http://www.luminarymicro.com/products/stellaris_811_evaluation_kits.html
+
+# include the FT2232 interface config for on-board JTAG interface
+source [find interface/luminary.cfg]
+
+# include the target config
+source [find target/lm3s811.cfg]
+
+# jtag speed
+jtag_khz 500
+
+jtag_nsrst_delay 100
+jtag_ntrst_delay 100
+
+#LM3S811 Evaluation Board has only srst
+reset_config srst_only
diff --git a/tcl/target/lm3s811.cfg b/tcl/target/lm3s811.cfg
index 2fa914faf..635e22e69 100644
--- a/tcl/target/lm3s811.cfg
+++ b/tcl/target/lm3s811.cfg
@@ -1,4 +1,4 @@
-# Script for luminary lm3s811
+# Script for TI/Luminary Stellaris LM3S811
 
 if { [info exists CHIPNAME] } {	
    set  _CHIPNAME $CHIPNAME    
@@ -16,26 +16,16 @@ if { [info exists ENDIAN] } {
 if { [info exists CPUTAPID ] } {
    set _CPUTAPID $CPUTAPID
 } else {
-  # force an error till we get a good number
    set _CPUTAPID 0x3ba00477
 }
 
-# jtag speed
-jtag_khz 500
-
-jtag_nsrst_delay 100
-jtag_ntrst_delay 100
-
-#LM3S811 Evaluation Board has only srst
-reset_config srst_only
-
 #jtag scan chain
 jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 1 -irmask 0xf -expected-id $_CPUTAPID
 
 # the luminary variant causes a software reset rather than asserting SRST
 # this stops the debug registers from being cleared
 # this will be fixed in later revisions of silicon
-set _TARGETNAME [format "%s.cpu" $_CHIPNAME]
+set _TARGETNAME $_CHIPNAME.cpu
 target create $_TARGETNAME cortex_m3 -endian $_ENDIAN -chain-position $_TARGETNAME -variant lm3s
 
 # 8k working area at base of ram