diff --git a/pkgs/applications/video/motion/default.nix b/pkgs/applications/video/motion/default.nix
new file mode 100644
index 000000000000..d52154887071
--- /dev/null
+++ b/pkgs/applications/video/motion/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libjpeg, ffmpeg }:
+
+stdenv.mkDerivation rec {
+  name = "motion-${version}";
+  version = "4.0.1";
+  src = fetchFromGitHub {
+    owner = "Motion-Project";
+    repo = "motion";
+    rev = "release-${version}";
+    sha256 = "172bn2ny5r9fcb4kn9bjq3znpgl8ai84w4b99vhk5jggp2haa3bb";
+  };
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  buildInputs = [ libjpeg ffmpeg ];
+  meta = with stdenv.lib; {
+    homepage = http://www.lavrsen.dk/foswiki/bin/view/Motion/WebHome;
+    description = "Monitors the video signal from cameras";
+    license = licenses.gpl2Plus;
+    maintainers = [ maintainers.puffnfresh ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 80b7aa702a8b..6bc2ee34452b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2378,6 +2378,8 @@ in
 
   most = callPackage ../tools/misc/most { };
 
+  motion = callPackage ../applications/video/motion { };
+
   mkcast = callPackage ../applications/video/mkcast { };
 
   multitail = callPackage ../tools/misc/multitail { };