diff --git a/midi2cv/bootloader/bootloader.cc b/midi2cv/bootloader/bootloader.cc
new file mode 100644
index 0000000..15a8a8a
--- /dev/null
+++ b/midi2cv/bootloader/bootloader.cc
@@ -0,0 +1,3 @@
+int main(void) {
+for(;;) ; //casual chillout
+}
diff --git a/midi2cv/bootloader/makefile b/midi2cv/bootloader/makefile
new file mode 100644
index 0000000..58b8d74
--- /dev/null
+++ b/midi2cv/bootloader/makefile
@@ -0,0 +1,43 @@
+# Copyright 2013 Emilie Gillet.
+#
+# Author: Emilie Gillet (emilie.o.gillet@gmail.com)
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+# 
+# See http://creativecommons.org/licenses/MIT/ for more information.
+
+# System specifications
+F_CRYSTAL      = 8000000L
+F_CPU          = 24000000L
+SYSCLOCK       = SYSCLK_FREQ_24MHz
+FAMILY         = f10x
+DENSITY        = md
+MEMORY_MODE    = flash
+
+# USB            = enabled
+
+# Preferred upload command
+UPLOAD_COMMAND  = upload_jtag
+
+# Packages to build
+TARGET         = midi2cv_bootloader
+PACKAGES       = midi2cv/bootloader midi2cv/drivers stmlib/utils stmlib/system
+RESOURCES      = midi2cv/resources
+
+include stmlib/makefile.inc
diff --git a/midi2cv/makefile b/midi2cv/makefile
index 11d504a..56f5dbd 100644
--- a/midi2cv/makefile
+++ b/midi2cv/makefile
@@ -32,7 +32,7 @@ DENSITY        = md
 MEMORY_MODE    = flash
 # USB            = enabled
 
-APPLICATION    = TRUE
+#APPLICATION    = TRUE
 BOOTLOADER     = midi2cv_bootloader
 
 # Preferred upload command