diff --git a/app/AvrdudeUploader.java b/app/AvrdudeUploader.java
index ca6e08505..5bc920304 100755
--- a/app/AvrdudeUploader.java
+++ b/app/AvrdudeUploader.java
@@ -38,6 +38,17 @@ public class AvrdudeUploader extends Uploader  {
 
   // XXX: add support for uploading sketches using a programmer
   public boolean uploadUsingPreferences(String buildPath, String className)
+  throws RunnerException {
+    if (Preferences.get("upload.using").equals("bootloader")) {
+      return uploadViaBootloader(buildPath, className);
+    } else {
+      Collection params = getProgrammerCommands(Preferences.get("upload.using"));
+      params.add("-Uflash:w:" + buildPath + File.separator + className + ".hex:i");
+      return avrdude(params);
+    }
+  }
+  
+  private boolean uploadViaBootloader(String buildPath, String className)
   throws RunnerException {
     List commandDownloader = new ArrayList();
     String protocol = Preferences.get("boards." + Preferences.get("board") + ".upload.protocol");
@@ -58,6 +69,10 @@ public class AvrdudeUploader extends Uploader  {
   }
   
   public boolean burnBootloader(String programmer) throws RunnerException {
+    return burnBootloader(getProgrammerCommands(programmer));
+  }
+  
+  private Collection getProgrammerCommands(String programmer) {
     List params = new ArrayList();
     params.add("-c" + Preferences.get("programmers." + programmer + ".protocol"));
     
@@ -73,7 +88,7 @@ public class AvrdudeUploader extends Uploader  {
     if (Preferences.get("programmers." + programmer + ".delay") != null)
       params.add("-i" + Preferences.get("programmers." + programmer + ".delay"));
     
-    return burnBootloader(params);
+    return params;
   }
   
   protected boolean burnBootloader(Collection params)
diff --git a/app/Editor.java b/app/Editor.java
index d9a4b14bd..9e5635b39 100644
--- a/app/Editor.java
+++ b/app/Editor.java
@@ -747,7 +747,7 @@ public class Editor extends JFrame
       });
     menu.add(item);
 
-    item = new JMenuItem("Copy for Discourse");
+    item = new JMenuItem("Copy for Forum");
     item.addActionListener(new ActionListener() {
         public void actionPerformed(ActionEvent e) {
           SwingUtilities.invokeLater(new Runnable() {
diff --git a/build/shared/lib/preferences.txt b/build/shared/lib/preferences.txt
index c1a193dab..7e04bb3e6 100755
--- a/build/shared/lib/preferences.txt
+++ b/build/shared/lib/preferences.txt
@@ -269,8 +269,7 @@ linestatus.height  = 20
 
 # set the upload defaults
 upload.verbose=false
-upload.erase=false
-upload.verify=false
+upload.using=bootloader
 
 # set the parallel port defaults (used if upload.programmer=dapa)
 parallel.port=0x378