diff --git a/boards.txt b/boards.txt
index 22603043..e0734096 100644
--- a/boards.txt
+++ b/boards.txt
@@ -11,6 +11,7 @@ arduino_101.vid.0x2A03.warning=Uncertified
 arduino_101.upload.tool=arduino101load
 arduino_101.upload.protocol=script
 arduino_101.upload.maximum_size=196608
+arduino_101.upload.maximum_data_size=8192
 arduino_101.upload.use_1200bps_touch=true
 arduino_101.upload.wait_for_upload_port=false
 arduino_101.upload.native_usb=false
diff --git a/platform.txt b/platform.txt
index 3bd09687..edfa67a0 100644
--- a/platform.txt
+++ b/platform.txt
@@ -85,7 +85,8 @@ recipe.output.save_file={build.project_name}.{build.variant}.hex
 
 ## Compute size
 recipe.size.pattern="{compiler.path}{compiler.size.cmd}" -A "{build.path}/{build.project_name}.elf"
-recipe.size.regex=Total\s+([0-9]+).*
+recipe.size.regex=^(?:text|ctors|rodata)\s+([0-9]+).*
+recipe.size.regex.data=^(?:datas|bss)\s+([0-9]+).*
 
 # Arc Uploader/Programmers tools
 # -------------------