diff --git a/chipset-cc256x/convert_bts_init_scripts.py b/chipset-cc256x/convert_bts_init_scripts.py
index 6d138bdc3..a0ba27ed4 100755
--- a/chipset-cc256x/convert_bts_init_scripts.py
+++ b/chipset-cc256x/convert_bts_init_scripts.py
@@ -274,13 +274,19 @@ if not files:
 
 # convert each of them
 for name in files:
+    name_lower = name.lower()
     # skip BLE and AVRP add-ons
-    if name.lower().startswith('ble_init_cc'):
+    if name_lower.startswith('ble_init_cc'):
         print "Skipping BLE add-on", name
         continue
-    if name.lower().startswith('avpr_init_cc'):
+    if name_lower.startswith('avpr_init_cc'):
         print "Skipping AVPR add-on", name
         continue
+    if re.match("initscripts_tiinit_.*_ble_add-on.bts", name_lower):
+        print "Skipping BLE add-on", name
+        continue
+    if re.match("initscripts_tiinit_.*_avpr_add-on.bts", name_lower):
+        print "Skipping AVPR add-on", name
 
     # check for BLE add-on
     add_on = ""
@@ -291,6 +297,13 @@ for name in files:
             add_on = potential_add_on
             print "Found", add_on, "add on for", name
 
+    name_parts = re.match('initscripts_TIInit_(\d*\.\d*\.\d*)_.*.bts', name)
+    if name_parts:
+        potential_add_on = 'initscripts_TIInit_%s_ble_add-on.bts' % name_parts.group(1)
+        if os.path.isfile(potential_add_on):
+            add_on = potential_add_on
+            print "Found", add_on, "add on for", name
+
     convert_bts(name, add_on)
 
 # done
diff --git a/docs/manual/docs/quick_start.md b/docs/manual/docs/quick_start.md
index 64e65dc9e..e44a7a9fc 100644
--- a/docs/manual/docs/quick_start.md
+++ b/docs/manual/docs/quick_start.md
@@ -176,6 +176,10 @@ the BLE part. The conversion script has been updated to detect
 *bluetooth_init_cc256x_1.2.bts* and adds *BLE_init_cc256x_1.2.bts*
 if present and merges them into a single .c file.
 
+**Update 2:** In May 2015, TI renamed the init scripts to match
+the naming scheme previously used on Linux systems. The conversion
+script has been updated to also detect *initscripts_TIInit_6.7.16_bt_spec_4.1.bts*
+and integrates *initscripts_TIInit_6.7.16_ble_add-on.bts* if present.
 
 ### MSP-EXP430F5438 + CC256x Platform {#sec:platformMSP430QuickStart}