diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix
new file mode 100644
index 000000000000..3e8b35ba4350
--- /dev/null
+++ b/pkgs/applications/misc/octoprint/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchFromGitHub, pythonPackages }:
+
+pythonPackages.buildPythonPackage rec {
+  name = "OctoPrint-${version}";
+  version = "1.2.9";
+
+  src = fetchFromGitHub {
+    owner = "foosel";
+    repo = "OctoPrint";
+    rev = version;
+    sha256 = "00hhq52jqwykhk3p57mn9kkcjbjz6g9mcrp96vx8lqzhw42m3a86";
+  };
+
+  # We need old Tornado
+  propagatedBuildInputs = with pythonPackages; [
+    awesome-slugify flask_assets watchdog rsa requests2 pkginfo pylru
+    semantic-version flask_principal sarge tornado_4_0_1 werkzeug netaddr flaskbabel
+    netifaces psutil pyserial flask_login pyyaml sockjs-tornado
+  ];
+
+  postPatch = ''
+    # Jailbreak dependencies
+    sed -i \
+      -e 's,rsa==,rsa>=,g' \
+      -e 's,sockjs-tornado==,sockjs-tornado>=,g' \
+      -e 's,Flask-Principal==,Flask-Principal>=,g' \
+      -e 's,werkzeug==,werkzeug>=,g' \
+      -e 's,netaddr==,netaddr>=,g' \
+      -e 's,requests==,requests>=,g' \
+      -e 's,netifaces==,netifaces>=,g' \
+      -e 's,psutil==,psutil>=,g' \
+      -e 's,PyYAML==,PyYAML>=,g' \
+      setup.py
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://octoprint.org/;
+    description = "The snappy web interface for your 3D printer";
+    platforms = platforms.all;
+    license = licenses.agpl3;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8f1a20fb5fdc..de99a999e3ae 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12983,6 +12983,8 @@ let
     pulseaudioSupport = config.pulseaudio or true;
   };
 
+  octoprint = callPackage ../applications/misc/octoprint { };
+
   ocrad = callPackage ../applications/graphics/ocrad { };
 
   offrss = callPackage ../applications/networking/offrss { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 074ae294d119..4c8ad7d907bb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3651,7 +3651,6 @@ in modules // {
     };
   };
 
-
   openstackclient = buildPythonPackage rec {
     name = "openstackclient-${version}";
     version = "1.7.1";