diff --git a/.gitmodules b/.gitmodules
index 9725b9722..3a4be5bfd 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,7 @@
 [submodule "src/vendor/Karabiner-DriverKit-VirtualHIDDevice"]
 	path = src/vendor/Karabiner-DriverKit-VirtualHIDDevice
 	url = https://github.com/pqrs-org/Karabiner-DriverKit-VirtualHIDDevice.git
+[submodule "src/vendor/Sparkle"]
+	path = src/vendor/Sparkle
+	url = https://github.com/sparkle-project/Sparkle
+	ignore = dirty
diff --git a/README.md b/README.md
index 2d0f74684..dcb4eb5f4 100644
--- a/README.md
+++ b/README.md
@@ -107,7 +107,7 @@ System requirements to build Karabiner-Elements:
 
 Karabiner-Elements uses some pre-built binaries in the source tree.
 
--   `src/vendor/Sparkle/Sparkle.framework`
+-   `src/vendor/Karabiner-DriverKit-VirtualHIDDevice/dist/Karabiner-DriverKit-VirtualHIDDevice-*.dmg`
 
 Above `make package` command does not rebuild these binaries.<br/>
 (These binaries will be copied in the distributed package.)
diff --git a/src/apps/Updater/CMakeLists.txt b/src/apps/Updater/CMakeLists.txt
index e56525434..9e16812a4 100644
--- a/src/apps/Updater/CMakeLists.txt
+++ b/src/apps/Updater/CMakeLists.txt
@@ -5,7 +5,7 @@ include (../../common.cmake)
 project (Karabiner-Elements)
 
 add_compile_options(
-  -F${CMAKE_CURRENT_LIST_DIR}/../../vendor/Sparkle
+  -F${CMAKE_CURRENT_LIST_DIR}/../../vendor/Sparkle/build/Build/Products/Release
 )
 
 include_directories(
@@ -19,7 +19,7 @@ add_executable(
   src/main.m
   Resources/MainMenu.xib
   ../share/Resources/app.icns
-  ../../vendor/Sparkle/Sparkle.framework
+  ../../vendor/Sparkle/build/Build/Products/Release/Sparkle.framework
 )
 
 set_source_files_properties(
@@ -31,7 +31,7 @@ set_source_files_properties(
 )
 
 set_source_files_properties(
-  ../../vendor/Sparkle/Sparkle.framework
+  ../../vendor/Sparkle/build/Build/Products/Release/Sparkle.framework
   PROPERTIES
   MACOSX_PACKAGE_LOCATION
   Frameworks
@@ -54,7 +54,7 @@ set_target_properties(
 target_link_libraries(
   Karabiner-Elements
   "-framework SystemConfiguration"
-  -F${CMAKE_CURRENT_LIST_DIR}/../../vendor/Sparkle
+  -F${CMAKE_CURRENT_LIST_DIR}/../../vendor/Sparkle/build/Build/Products/Release
   "-framework Sparkle"
   c++
 )
diff --git a/src/apps/Updater/Makefile b/src/apps/Updater/Makefile
index dde3b22b9..86f1e0ed2 100644
--- a/src/apps/Updater/Makefile
+++ b/src/apps/Updater/Makefile
@@ -1,9 +1,7 @@
-AUTOUPDATE_ICON = 'build_xcode/build/Release/Karabiner-Elements.app/Contents/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/AppIcon.icns'
-
 all:
 	make -C ../lib/KarabinerKit
+	make -C ../../vendor
 	make build_xcode
-	install -m 644 ../share/Resources/app.icns $(AUTOUPDATE_ICON)
 
 clean: clean_builds
 
diff --git a/src/vendor/Makefile b/src/vendor/Makefile
index 885575b3b..20b76ac05 100644
--- a/src/vendor/Makefile
+++ b/src/vendor/Makefile
@@ -1,5 +1,8 @@
 all:
-	@echo 'Type "make update_cget"'
+	bash build-sparkle.sh
+
+clean:
+	cd Sparkle && git clean -d -f -x
 
 update_cget:
 	rm -rf cget
diff --git a/src/vendor/Sparkle b/src/vendor/Sparkle
new file mode 160000
index 000000000..f2fc729b6
--- /dev/null
+++ b/src/vendor/Sparkle
@@ -0,0 +1 @@
+Subproject commit f2fc729b69a28ae671a947f6e2bab4131946af23
diff --git a/src/vendor/build-sparkle.sh b/src/vendor/build-sparkle.sh
new file mode 100755
index 000000000..648024ab4
--- /dev/null
+++ b/src/vendor/build-sparkle.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+cd "$(dirname $0)"
+cd "$(pwd -P)"
+
+#
+# Sparkle
+#
+
+build=$(pwd)/Sparkle/build
+
+if [[ -d "$build" ]]; then
+    echo "Sparkle is already built."
+else
+    cd Sparkle && xcodebuild -scheme Distribution -configuration Release -derivedDataPath "$build" build
+fi
diff --git a/version b/version
index bcf8d0a8d..cbacb1d0c 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-12.90.4
+12.90.5