diff --git a/homeassistant/startup/__init__.py b/homeassistant/startup/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/scripts/org.homeassistant.plist b/homeassistant/startup/launchd.plist
similarity index 92%
rename from scripts/org.homeassistant.plist
rename to homeassistant/startup/launchd.plist
index e199b990a72..50bc18e3e38 100644
--- a/scripts/org.homeassistant.plist
+++ b/homeassistant/startup/launchd.plist
@@ -26,9 +26,6 @@
       <false/>
     </dict>
 
-    <key>WorkingDirectory</key>
-    <string>$APP_PATH$</string>
-
     <key>StandardErrorPath</key>
     <string>/Users/$USER$/Library/Logs/homeassitant.log</string>
 
diff --git a/setup.py b/setup.py
index ce8a75072ac..fde7f9bf898 100755
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,8 @@ PACKAGES = find_packages(exclude=['tests', 'tests.*'])
 PACKAGE_DATA = \
     {'homeassistant.components.frontend': ['index.html.template'],
      'homeassistant.components.frontend.www_static': ['*.*'],
-     'homeassistant.components.frontend.www_static.images': ['*.*']}
+     'homeassistant.components.frontend.www_static.images': ['*.*'],
+     'homeassistant.startup': ['*.*']}
 
 REQUIRES = [
     'requests>=2,<3',