diff --git a/stm32flash-r61/Makefile b/stm32flash-r61/Makefile
new file mode 100644
index 0000000..f986d2d
--- /dev/null
+++ b/stm32flash-r61/Makefile
@@ -0,0 +1,100 @@
+#
+#    Copyright (c) 2010-2012 Nest Labs, Inc.
+#    All rights reserved.
+#
+#    This document is the property of Nest. It is considered
+#    confidential and proprietary information.
+#
+#    This document may not be reproduced or transmitted in any form,
+#    in whole or in part, without the express written permission of
+#    Nest.
+#
+#    Description:
+#      This file is the makefile for the STM32 flash utility.
+#
+
+BuildConfigSpecialized	:= No
+BuildProductSpecialized	:= No
+EnableParallel  = Yes
+
+include pre.mak
+
+PackageRoot		:= .
+
+PackageName		:= stm32flash
+
+PackageSeparator	:=
+
+PackageSourceDir	:= $(PackageRoot)/$(PackageName)
+
+PackageBuildMakefile	= $(call GenerateBuildPaths,Makefile)
+
+LicenseSourceFile	:= $(PackageSourceDir)/gpl-2.0.txt
+
+CleanPaths		+= $(PackageLicenseFile)
+
+ExecutableName		:= $(PackageName)
+
+all: $(PackageDefaultGoal)
+
+# Generate the package license contents.
+
+$(LicenseSourceFile): source
+
+$(PackageLicenseFile): $(LicenseSourceFile)
+	$(copy-result)
+
+# We are building this package from version-controlled source, so
+# there is nothing to do for this target goal.
+
+$(PackageSourceDir):
+
+# Prepare the sources.
+
+.PHONY: source
+source: | $(PackageSourceDir)
+
+# Patch the sources, if necessary.
+
+.PHONY: patch
+patch: source
+
+# Generate the package build makefile.
+
+$(PackageBuildMakefile): | $(PackageSourceDir) $(BuildDirectory)
+	$(call create-links,$(CURDIR)/$(PackageSourceDir),$(BuildDirectory))
+
+# Configure the source for building.
+
+.PHONY: configure
+configure: source $(PackageBuildMakefile)
+
+# Build the source.
+#
+# We have to unset MAKEFLAGS since they confuse the package build otherwise.
+
+.PHONY: build
+build: configure
+	$(Verbose)unset MAKEFLAGS && \
+	$(MAKE) $(JOBSFLAG) -C $(BuildDirectory) \
+	INSTALL="$(INSTALL) $(INSTALLFLAGS)" \
+	CC="$(CC)" CXX="$(CXX)" AR=$(AR) NM=$(NM) RANLIB=$(RANLIB) STRIP=$(STRIP) \
+	all
+
+# Stage the build to a temporary installation area.
+#
+# We have to unset MAKEFLAGS since they confuse the package build otherwise.
+
+.PHONY: stage
+stage: build | $(ResultDirectory)
+	$(Verbose)unset MAKEFLAGS && \
+	$(MAKE) $(JOBSFLAG) -C $(BuildDirectory) \
+	INSTALL="$(INSTALL) $(INSTALLFLAGS)" \
+	DESTDIR=$(ResultDirectory) \
+	install
+
+clean:
+	$(Verbose)$(RM) $(RMFLAGS) -r $(BuildDirectory)
+	$(Verbose)$(RM) $(RMFLAGS) -r $(ResultDirectory)
+
+include post.mak
diff --git a/stm32flash-r61/stm32flash.tar.gz b/stm32flash-r61/stm32flash.tar.gz
new file mode 100644
index 0000000..0ca0266
--- /dev/null
+++ b/stm32flash-r61/stm32flash.tar.gz
Binary files differ
diff --git a/stm32flash-r61/stm32flash.url b/stm32flash-r61/stm32flash.url
new file mode 100644
index 0000000..bcb3029
--- /dev/null
+++ b/stm32flash-r61/stm32flash.url
@@ -0,0 +1 @@
+http://stm32flash.googlecode.com/svn/trunk/
diff --git a/stm32flash-r61/stm32flash.version b/stm32flash-r61/stm32flash.version
new file mode 100644
index 0000000..9d719b7
--- /dev/null
+++ b/stm32flash-r61/stm32flash.version
@@ -0,0 +1 @@
+r61