diff --git a/AVRsack/ASBuilder.swift b/AVRsack/ASBuilder.swift
index 695c6a1..22d2bc7 100644
--- a/AVRsack/ASBuilder.swift
+++ b/AVRsack/ASBuilder.swift
@@ -21,6 +21,10 @@ class ASBuilder {
         task?.waitUntilExit()
     }
     
+    func cleanProject() {
+        NSFileManager.defaultManager().removeItemAtURL(dir.URLByAppendingPathComponent("build"), error: nil)
+    }
+    
     func buildProject(board: String, files: ASFileTree) {
         task = NSTask()
         task!.currentDirectoryPath  = dir.path!
diff --git a/AVRsack/ASProjDoc.swift b/AVRsack/ASProjDoc.swift
index 303e8f6..20452de 100644
--- a/AVRsack/ASProjDoc.swift
+++ b/AVRsack/ASProjDoc.swift
@@ -280,9 +280,17 @@ class ASProjDoc: NSDocument, NSOutlineViewDelegate {
     
     // MARK: Build / Upload
     
+    @IBAction func uploadProject(AnyObject) {
+    }
+    
     @IBAction func buildProject(AnyObject) {
         selectNode(files.buildLog)
         builder.buildProject(board, files: files)
     }
+    
+    @IBAction func cleanProject(AnyObject) {
+        builder.cleanProject()
+        selectNode(files.buildLog)
+    }
 }
 
diff --git a/AVRsack/Base.lproj/ASProjDoc.xib b/AVRsack/Base.lproj/ASProjDoc.xib
index 7f418f9..e1f4ba7 100644
--- a/AVRsack/Base.lproj/ASProjDoc.xib
+++ b/AVRsack/Base.lproj/ASProjDoc.xib
@@ -99,18 +99,26 @@
                     <toolbarItem implicitItemIdentifier="NSToolbarFlexibleSpaceItem" id="2D6-o4-n09"/>
                     <toolbarItem implicitItemIdentifier="2EA4AC26-099B-4756-8779-ABB6208840D1" label="Build" paletteLabel="Build" tag="-1" image="BuildIcon" id="69r-aN-6vG">
                         <connections>
-                            <action selector="buildProject:" target="-2" id="Les-fd-6cC"/>
+                            <action selector="buildProject:" target="-1" id="Rkc-yl-Vwi"/>
                         </connections>
                     </toolbarItem>
                     <toolbarItem implicitItemIdentifier="EF9FF3B4-6921-497E-B17C-8B0B3D58DA24" label="Upload" paletteLabel="Upload" tag="-1" image="UploadIcon" id="2cP-cC-Cr8">
                         <connections>
-                            <action selector="buildProject:" target="-2" id="i2T-Xo-7Xz"/>
+                            <action selector="uploadProject:" target="-1" id="p1l-Vg-i2P"/>
                         </connections>
                     </toolbarItem>
+                    <toolbarItem implicitItemIdentifier="2E9BF3BA-BCC5-4DB8-B563-8648FC3862AD" label="Clean" paletteLabel="Clean" tag="-1" image="CleanIcon" id="lGv-lT-Eh9">
+                        <connections>
+                            <action selector="cleanProject:" target="-1" id="LzL-6C-IDi"/>
+                        </connections>
+                    </toolbarItem>
+                    <toolbarItem implicitItemIdentifier="NSToolbarSpaceItem" id="FYt-ZW-Epr"/>
                 </allowedToolbarItems>
                 <defaultToolbarItems>
-                    <toolbarItem reference="69r-aN-6vG"/>
                     <toolbarItem reference="2cP-cC-Cr8"/>
+                    <toolbarItem reference="69r-aN-6vG"/>
+                    <toolbarItem reference="FYt-ZW-Epr"/>
+                    <toolbarItem reference="lGv-lT-Eh9"/>
                     <toolbarItem reference="2D6-o4-n09"/>
                     <toolbarItem reference="ln2-Ky-MBg"/>
                 </defaultToolbarItems>
@@ -123,6 +131,7 @@
     </objects>
     <resources>
         <image name="BuildIcon" width="32" height="32"/>
+        <image name="CleanIcon" width="32" height="32"/>
         <image name="UploadIcon" width="32" height="32"/>
     </resources>
 </document>
diff --git a/AVRsack/Images.xcassets/CleanIcon.imageset/CleanIcon 1x.png b/AVRsack/Images.xcassets/CleanIcon.imageset/CleanIcon 1x.png
new file mode 100644
index 0000000..123d4aa
Binary files /dev/null and b/AVRsack/Images.xcassets/CleanIcon.imageset/CleanIcon 1x.png differ
diff --git a/AVRsack/Images.xcassets/CleanIcon.imageset/CleanIcon 2x.png b/AVRsack/Images.xcassets/CleanIcon.imageset/CleanIcon 2x.png
new file mode 100644
index 0000000..7f8270a
Binary files /dev/null and b/AVRsack/Images.xcassets/CleanIcon.imageset/CleanIcon 2x.png differ
diff --git a/AVRsack/Images.xcassets/CleanIcon.imageset/CleanIcon 3x.png b/AVRsack/Images.xcassets/CleanIcon.imageset/CleanIcon 3x.png
new file mode 100644
index 0000000..e6164d3
Binary files /dev/null and b/AVRsack/Images.xcassets/CleanIcon.imageset/CleanIcon 3x.png differ
diff --git a/AVRsack/Images.xcassets/CleanIcon.imageset/Contents.json b/AVRsack/Images.xcassets/CleanIcon.imageset/Contents.json
new file mode 100644
index 0000000..3b7e224
--- /dev/null
+++ b/AVRsack/Images.xcassets/CleanIcon.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "CleanIcon 1x.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "CleanIcon 2x.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "CleanIcon 3x.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file