diff --git a/package/package_esp8266com_index.template.json b/package/package_esp8266com_index.template.json
index 65b6f32388..177a866b20 100644
--- a/package/package_esp8266com_index.template.json
+++ b/package/package_esp8266com_index.template.json
@@ -91,7 +91,7 @@
             },
             {
               "name": "Digistump Oak"
-            },
+            }
           ],
           "toolsDependencies": [
             {
diff --git a/tools/boards.txt.py b/tools/boards.txt.py
index 5d0a1db279..066ccf52b6 100755
--- a/tools/boards.txt.py
+++ b/tools/boards.txt.py
@@ -1182,9 +1182,10 @@ def package ():
         filestr = package_file.read()
 
     substitution = '"boards": [\n'
-    for id in boards:
-        substitution += '            {\n              "name": "' + boards[id]['name'] + '"\n            },\n'
-    substitution += '          ],'
+    board_items = ['            {\n              "name": "%s"\n            }' % boards[id]['name']
+                    for id in boards]
+    substitution += ',\n'.join(board_items)        
+    substitution += '\n          ],'
 
     newfilestr = re.sub(r'"boards":[^\]]*\],', substitution, filestr, re.MULTILINE)