diff --git a/pkgs/development/tools/misc/teensy-loader-cli/default.nix b/pkgs/development/tools/misc/teensy-loader-cli/default.nix
new file mode 100644
index 000000000000..db86f1a56d6e
--- /dev/null
+++ b/pkgs/development/tools/misc/teensy-loader-cli/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, unzip, libusb, fetchgit }:
+let
+  version = "2.1";
+in
+stdenv.mkDerivation {
+  name = "teensy-loader-cli-${version}";
+  src = fetchgit {
+    url = "git://github.com/PaulStoffregen/teensy_loader_cli.git";
+    rev = "001da416bc362ff24485ff97e3a729bd921afe98";
+    sha256 = "36aed0a725055e36d71183ff57a023993099fdc380072177cffc7676da3c3966";
+  };
+
+  buildInputs = [ unzip libusb ];
+
+  installPhase = ''
+    install -Dm755 teensy_loader_cli $out/bin/teensy-loader-cli
+  '';
+
+  meta = with stdenv.lib; {
+    license = licenses.gpl3;
+    description = "Firmware uploader for the Teensy microcontroller boards";
+    homepage = http://www.pjrc.com/teensy/;
+    maintainers = with maintainers; [ the-kenny ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/development/tools/misc/teensy/default.nix b/pkgs/development/tools/misc/teensy/default.nix
deleted file mode 100644
index 9902cd034539..000000000000
--- a/pkgs/development/tools/misc/teensy/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchurl, unzip, libusb }:
-let
-  version = "2.1";
-in
-stdenv.mkDerivation {
-  name = "teensy-loader-${version}";
-  src = fetchurl {
-    url = "http://www.pjrc.com/teensy/teensy_loader_cli.2.1.zip";
-    sha256 = "0iidj3q0l2hds1gaadnwgni4qdgk6r0nv101986jxda8cw6h9zfs";
-  };
-
-  buildInputs = [ unzip libusb ];
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp -v teensy_loader_cli $out/bin/
-  '';
-
-  meta = with stdenv.lib; {
-    license = licenses.gpl3;
-    description = "Firmware uploader for the Teensy microcontroller board";
-    homepage = http://www.pjrc.com/teensy/;
-    maintainers = with maintainers; [ the-kenny ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 91c771425ac9..16ac093df43f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5750,7 +5750,7 @@ let
 
   tcptrack = callPackage ../development/tools/misc/tcptrack { };
 
-  teensy-loader = callPackage ../development/tools/misc/teensy { };
+  teensy-loader-cli = callPackage ../development/tools/misc/teensy-loader-cli { };
 
   texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { };
   texinfo4 = texinfo413;