diff --git a/AndroidBoard.mk b/AndroidBoard.mk
index 0662dbf..105d8ab 100644
--- a/AndroidBoard.mk
+++ b/AndroidBoard.mk
@@ -40,8 +40,7 @@ INSTALLED_SUPERIMAGE_DUMMY_TARGET := $(PRODUCT_OUT)/super_dummy.img
 $(INSTALLED_SUPERIMAGE_DUMMY_TARGET): $(PRODUCT_OUT)/super_empty.img $(LPFLASH)
 	$(call pretty,"Target dummy super image: $@")
 	$(hide) touch $@
-	$(hide) echo $(CURDIR)
-	$(hide) $(LPFLASH) $(CURDIR)/$@ $(CURDIR)/$(PRODUCT_OUT)/super_empty.img
+	$(hide) $(LPFLASH) $@ $(PRODUCT_OUT)/super_empty.img
 
 .PHONY: super_dummyimage
 super_dummyimage: $(INSTALLED_SUPERIMAGE_DUMMY_TARGET)
diff --git a/releasetools/releasetools.py b/releasetools/releasetools.py
index 12f2f95..83d4e7e 100644
--- a/releasetools/releasetools.py
+++ b/releasetools/releasetools.py
@@ -83,6 +83,18 @@ def AddBootloaderFlash(info, input_zip):
   info.script.AppendExtra('      package_extract_file("firmware-update/bootlogo_android.bmp", "' + NX_FILES + '/switchroot/android/bootlogo_android.bmp");')
   info.script.AppendExtra('      package_extract_file("firmware-update/icon_android_hue.bmp", "' + NX_FILES + '/switchroot/android/icon_android_hue.bmp");')
   info.script.AppendExtra('      run_program("/system/bin/umount", "' + NX_FILES + '");')
+
+  """ flash super_empty if needed """
+  info.script.AppendExtra('      ifelse(')
+  info.script.AppendExtra('        nx.check_super() == "",')
+  info.script.AppendExtra('        (')
+  info.script.AppendExtra('          ui_print("Super partition not set up--flashing super_empty");')
+  info.script.AppendExtra('          package_extract_file("firmware-update/super_dummy.img", "' + SUPER_PART + '");')
+  info.script.AppendExtra('        ),')
+  info.script.AppendExtra('        (')
+  info.script.AppendExtra('          ui_print("Super partition already present");')
+  info.script.AppendExtra('        )')
+  info.script.AppendExtra('      );')
   info.script.AppendExtra('    )')
   info.script.AppendExtra('  );')