diff --git a/Formula/mackup.rb b/Formula/mackup.rb
index 56c3aa2fee..eed5190323 100644
--- a/Formula/mackup.rb
+++ b/Formula/mackup.rb
@@ -2,14 +2,29 @@ require "formula"
 
 class Mackup < Formula
   homepage "https://github.com/lra/mackup"
-  url "https://github.com/lra/mackup/archive/0.8.3.tar.gz"
-  sha1 "09e455ab0e8efec8500ba07fef3e8b3633c13d28"
+  url "https://pypi.python.org/packages/source/m/mackup/mackup-0.8.5.tar.gz"
+  sha256 "5c74d7ded75304863b2be8b13ca58319f92f22f58dd778800326fb7618a8a7e6"
 
   head "https://github.com/lra/mackup.git"
 
+  depends_on :python if MacOS.version <= :snow_leopard
+
+  resource "docopt" do
+    url "https://pypi.python.org/packages/source/d/docopt/docopt-0.6.2.tar.gz"
+    sha256 "49b3a825280bd66b3aa83585ef59c4a8c82f2c8a522dbe754a8bc8d08c85c491"
+  end
+
   def install
+    ENV.prepend_create_path "PYTHONPATH", libexec/"vendor/lib/python2.7/site-packages"
+    %w[docopt].each do |r|
+      resource(r).stage do
+        system "python", *Language::Python.setup_install_args(libexec/"vendor")
+      end
+    end
+
     ENV.prepend_create_path "PYTHONPATH", libexec/"lib/python2.7/site-packages"
     system "python", *Language::Python.setup_install_args(libexec)
+
     bin.install Dir[libexec/"bin/*"]
     bin.env_script_all_files(libexec/"bin", :PYTHONPATH => ENV["PYTHONPATH"])
   end