diff --git a/Makefile b/Makefile
index 6a15b7e4c6..cefd0a4957 100644
--- a/Makefile
+++ b/Makefile
@@ -788,6 +788,8 @@ config:
 		elif [ -f /etc/SuSE-release -o -f /etc/novell-release ]; then \
 			$(INSTALL) -m 755 contrib/init.d/rc.suse.asterisk $(DESTDIR)/etc/init.d/asterisk; \
 			if [ -z "$(DESTDIR)" ]; then /sbin/chkconfig --add asterisk; fi; \
+		elif [ -d $(DESTDIR)/Library/LaunchDaemons -a ! -f $(DESTDIR)/Library/LaunchDaemons/org.asterisk.asterisk.plist ]; then \
+			$(INSTALL) -m 644 contrib/init.d/org.asterisk.asterisk.plist $(DESTDIR)/Library/LaunchDaemons/org.asterisk.asterisk.plist; \
 		elif [ -f /etc/slackware-version ]; then \
 			echo "Slackware is not currently supported, although an init script does exist for it."; \
 		else \
diff --git a/contrib/init.d/org.asterisk.asterisk.plist b/contrib/init.d/org.asterisk.asterisk.plist
new file mode 100644
index 0000000000..a0c87e8359
--- /dev/null
+++ b/contrib/init.d/org.asterisk.asterisk.plist
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>Label</key>
+	<string>org.asterisk.asterisk.launchagent</string>
+	<key>Disabled</key>
+	<false/><!-- Change this to '<true/>' to disable Asterisk -->
+	<key>UserName</key>
+	<string>asterisk</string>
+	<key>GroupName</key>
+	<string>asterisk</string>
+	<key>OnDemand</key><!-- For 10.4 (deprecated in 10.5 and above) -->
+	<false/>
+	<key>KeepAlive</key><!-- For 10.5 and above -->
+	<true/>
+	<key>RunAtLoad</key>
+	<true/>
+	<key>Umask</key>
+	<integer>432</integer><!-- 0660 -->
+	<key>Program</key>
+	<string>/usr/local/sbin/asterisk</string>
+	<key>ProgramArguments</key>
+	<array>
+		<string>/usr/local/sbin/asterisk</string>
+		<string>-f</string><!-- Don't fork.  This option is mandatory when running with launchd. -->
+	</array>
+	<key>EnvironmentVariables</key>
+	<dict>
+		<key>TERM</key>
+		<string>xterm-color</string>
+	</dict>
+	<key>SoftResourceLimits</key>
+	<dict>
+		<key>NumberOfFiles</key>
+		<integer>1024</integer>
+		<key>Core</key>
+		<integer>0</integer>
+	</dict>
+	<key>StandardInPath</key>
+	<string>/dev/null</string>
+	<key>StandardOutPath</key>
+	<string>/dev/null</string>
+	<key>StandardErrorPath</key>
+	<string>/dev/null</string>
+</dict>
+</plist>
diff --git a/main/asterisk.c b/main/asterisk.c
index 7aab1f023c..1f5987b72f 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -3329,7 +3329,7 @@ int main(int argc, char *argv[])
 		} else
 			ast_log(LOG_WARNING, "Unable to open pid file '%s': %s\n", ast_config_AST_PID, strerror(errno));
 #else
-		ast_log(LOG_WARNING, "Mac OS X detected.  Use '/sbin/launchd -d' to launch with the nofork option.\n");
+		ast_log(LOG_WARNING, "Mac OS X detected.  Use 'launchctl load /Library/LaunchDaemon/org.asterisk.asterisk.plist'.\n");
 #endif
 	}
 #endif