diff --git a/misc/launchd/README.md b/misc/launchd/README.md
new file mode 100644
index 000000000..ab0ed2fc5
--- /dev/null
+++ b/misc/launchd/README.md
@@ -0,0 +1,9 @@
+# ipfs launchd agent
+
+A bare-bones launchd agent file for ipfs. To have launchd automatically run the ipfs daemon for you, do the following:
+
+    mkdir -p ~/Library/LaunchAgents
+    cp misc/launchctl/io.ipfs.ipfs-daemon.plist ~/Library/LaunchAgents/
+    launchctl load ~/Library/LaunchAgents/io.ipfs.ipfs-daemon.plist
+
+Note that the `ipfs` binary must be on the *system* PATH for this to work. Adding a symlink in /usr/bin works well enough for me.
diff --git a/misc/launchd/io.ipfs.ipfs-daemon.plist b/misc/launchd/io.ipfs.ipfs-daemon.plist
new file mode 100644
index 000000000..2012623a6
--- /dev/null
+++ b/misc/launchd/io.ipfs.ipfs-daemon.plist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>KeepAlive</key>
+    <true/>
+    <key>Label</key>
+    <string>io.ipfs.ipfs-daemon</string>
+    <key>ProgramArguments</key>
+    <array>
+      <string>ipfs</string>
+      <string>daemon</string>
+    </array>
+    <key>RunAtLoad</key>
+    <true/>
+    <key>StandardErrorPath</key>
+    <string>/usr/local/var/log/ipfs.err</string>
+    <key>StandardOutPath</key>
+    <string>/usr/local/var/log/ipfs.log</string>
+  </dict>
+</plist>
+