diff --git a/lib/services/systemd.c b/lib/services/systemd.c
index e806b425d9..865de1784c 100644
--- a/lib/services/systemd.c
+++ b/lib/services/systemd.c
@@ -1,668 +1,680 @@
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * Copyright (C) 2012 Andrew Beekhof <andrew@beekhof.net>
  */
 
 #include <crm_internal.h>
 #include <crm/crm.h>
 #include <crm/services.h>
 #include <crm/common/mainloop.h>
 
 #include <gio/gio.h>
 #include <services_private.h>
 #include <systemd.h>
 #include <dbus/dbus.h>
 #include <pcmk-dbus.h>
 
 #define BUS_NAME "org.freedesktop.systemd1"
 #define BUS_PATH "/org/freedesktop/systemd1"
 
 #define BUS_PROPERTY_IFACE "org.freedesktop.DBus.Properties"
 
 /*
    /usr/share/dbus-1/interfaces/org.freedesktop.systemd1.Manager.xml
 */
 gboolean
 systemd_unit_exec_with_unit(svc_action_t * op, const char *unit);
 
 
 struct unit_info {
     const char *id;
     const char *description;
     const char *load_state;
     const char *active_state;
     const char *sub_state;
     const char *following;
     const char *unit_path;
     uint32_t job_id;
     const char *job_type;
     const char *job_path;
 };
 
 struct pcmk_dbus_data 
 {
         char *name;
         char *unit;
         DBusError error;
         svc_action_t *op;
         void (*callback)(DBusMessage *reply, svc_action_t *op);
 };
 
 static DBusMessage *systemd_new_method(const char *iface, const char *method)
 {
     crm_trace("Calling: %s on %s", method, iface);
     return dbus_message_new_method_call(BUS_NAME, // target for the method call
                                         BUS_PATH, // object to call on
                                         iface, // interface to call on
                                         method); // method name
 }
 
 
 static DBusConnection* systemd_proxy = NULL;
 static gboolean
 systemd_init(void)
 {
     static int need_init = 1;
     /* http://dbus.freedesktop.org/doc/api/html/group__DBusConnection.html */
 
     if (need_init) {
         need_init = 0;
         systemd_proxy = pcmk_dbus_connect();
     }
     if (systemd_proxy == NULL) {
         return FALSE;
     }
     return TRUE;
 }
 
 void
 systemd_cleanup(void)
 {
     if (systemd_proxy) {
         pcmk_dbus_disconnect(systemd_proxy);
         systemd_proxy = NULL;
     }
 }
 
 static char *
 systemd_service_name(const char *name)
 {
     if (name == NULL) {
         return NULL;
 
     } else if (strstr(name, ".service")) {
         return strdup(name);
     }
 
     return crm_strdup_printf("%s.service", name);
 }
 
 static void
 systemd_daemon_reload_complete(DBusPendingCall *pending, void *user_data)
 {
     DBusError error;
     DBusMessage *reply = NULL;
     unsigned int reload_count = GPOINTER_TO_UINT(user_data);
 
     dbus_error_init(&error);
     if(pending) {
         reply = dbus_pending_call_steal_reply(pending);
     }
 
     if(pcmk_dbus_find_error("Reload", pending, reply, &error)) {
         crm_err("Could not issue systemd reload %d: %s", reload_count, error.message);
 
     } else {
         crm_trace("Reload %d complete", reload_count);
     }
 
     if(pending) {
         dbus_pending_call_unref(pending);
     }
     if(reply) {
         dbus_message_unref(reply);
     }
 }
 
 static bool
 systemd_daemon_reload(void)
 {
     static unsigned int reload_count = 0;
     const char *method = "Reload";
 
 
     reload_count++;
     if(reload_count % 10 == 0) {
         DBusMessage *msg = systemd_new_method(BUS_NAME".Manager", method);
 
         CRM_ASSERT(msg != NULL);
         pcmk_dbus_send(msg, systemd_proxy, systemd_daemon_reload_complete, GUINT_TO_POINTER(reload_count));
         dbus_message_unref(msg);
     }
     return TRUE;
 }
 
 static const char *
 systemd_loadunit_result(DBusMessage *reply, svc_action_t * op)
 {
     const char *path = NULL;
 
     if(pcmk_dbus_find_error("LoadUnit", (void*)&path, reply, NULL)) {
         if(op) {
             crm_warn("No unit found for %s", op->rsc);
         }
 
     } else if(pcmk_dbus_type_check(reply, NULL, DBUS_TYPE_OBJECT_PATH, __FUNCTION__, __LINE__)) {
         dbus_message_get_args (reply, NULL,
                                DBUS_TYPE_OBJECT_PATH, &path,
                                DBUS_TYPE_INVALID);
     }
 
     if(op) {
         systemd_unit_exec_with_unit(op, path);
     }
 
     return path;
 }
 
 
 static void
 systemd_loadunit_cb(DBusPendingCall *pending, void *user_data)
 {
     DBusMessage *reply = NULL;
     svc_action_t * op = user_data;
 
     if(pending) {
         reply = dbus_pending_call_steal_reply(pending);
     }
 
     if(op) {
         crm_trace("Got result: %p for %p for %s, %s", reply, pending, op->rsc, op->action);
     } else {
         crm_trace("Got result: %p for %p", reply, pending);
     }
     systemd_loadunit_result(reply, user_data);
 
     if(pending) {
         dbus_pending_call_unref(pending);
     }
     if(reply) {
         dbus_message_unref(reply);
     }
 }
 
 static char *
 systemd_unit_by_name(const gchar * arg_name, svc_action_t *op)
 {
     DBusMessage *msg;
     DBusMessage *reply = NULL;
     char *name = NULL;
 
 /*
   Equivalent to GetUnit if its already loaded
   <method name="LoadUnit">
    <arg name="name" type="s" direction="in"/>
    <arg name="unit" type="o" direction="out"/>
   </method>
  */
 
     if (systemd_init() == FALSE) {
         return FALSE;
     }
 
     msg = systemd_new_method(BUS_NAME".Manager", "LoadUnit");
     CRM_ASSERT(msg != NULL);
 
     name = systemd_service_name(arg_name);
     CRM_LOG_ASSERT(dbus_message_append_args(msg, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID));
     free(name);
 
     if(op == NULL || op->synchronous) {
         const char *unit = NULL;
         char *munit = NULL;
         DBusError error;
 
         dbus_error_init(&error);
         reply = pcmk_dbus_send_recv(msg, systemd_proxy, &error);
         dbus_message_unref(msg);
 
         unit = systemd_loadunit_result(reply, op);
         if(unit) {
             munit = strdup(unit);
         }
         if(reply) {
             dbus_message_unref(reply);
         }
         return munit;
     }
 
     pcmk_dbus_send(msg, systemd_proxy, systemd_loadunit_cb, op);
     dbus_message_unref(msg);
     return NULL;
 }
 
 GList *
 systemd_unit_listall(void)
 {
     int lpc = 0;
     GList *units = NULL;
     DBusMessageIter args;
     DBusMessageIter unit;
     DBusMessageIter elem;
     DBusMessage *msg = NULL;
     DBusMessage *reply = NULL;
     const char *method = "ListUnits";
     DBusError error;
 
     if (systemd_init() == FALSE) {
         return NULL;
     }
 
 /*
         "  <method name=\"ListUnits\">\n"                               \
         "   <arg name=\"units\" type=\"a(ssssssouso)\" direction=\"out\"/>\n" \
         "  </method>\n"                                                 \
 */
 
     dbus_error_init(&error);
     msg = systemd_new_method(BUS_NAME".Manager", method);
     CRM_ASSERT(msg != NULL);
 
     reply = pcmk_dbus_send_recv(msg, systemd_proxy, &error);
     dbus_message_unref(msg);
 
     if(error.name) {
         crm_err("Call to %s failed: %s", method, error.name);
         return NULL;
 
     } else if (reply == NULL) {
         crm_err("Call to %s failed: Message has no reply", method);
         return NULL;
 
     } else if (!dbus_message_iter_init(reply, &args)) {
         crm_err("Call to %s failed: Message has no arguments", method);
         dbus_message_unref(reply);
         return NULL;
     }
 
     if(!pcmk_dbus_type_check(reply, &args, DBUS_TYPE_ARRAY, __FUNCTION__, __LINE__)) {
         crm_err("Call to %s failed: Message has invalid arguments", method);
         dbus_message_unref(reply);
         return NULL;
     }
 
     dbus_message_iter_recurse(&args, &unit);
     while (dbus_message_iter_get_arg_type (&unit) != DBUS_TYPE_INVALID) {
         DBusBasicValue value;
 
         if(!pcmk_dbus_type_check(reply, &unit, DBUS_TYPE_STRUCT, __FUNCTION__, __LINE__)) {
             continue;
         }
 
         dbus_message_iter_recurse(&unit, &elem);
         if(!pcmk_dbus_type_check(reply, &elem, DBUS_TYPE_STRING, __FUNCTION__, __LINE__)) {
             continue;
         }
 
         dbus_message_iter_get_basic(&elem, &value);
         crm_trace("Got: %s", value.str);
         if(value.str) {
             char *match = strstr(value.str, ".service");
 
             if (match) {
                 lpc++;
                 match[0] = 0;
 
                 units = g_list_append(units, strdup(value.str));
             }
         }
         dbus_message_iter_next (&unit);
     }
 
     dbus_message_unref(reply);
 
     crm_trace("Found %d systemd services", lpc);
     return units;
 }
 
 gboolean
 systemd_unit_exists(const char *name)
 {
     char *unit = NULL;
 
     /* Note: Makes a blocking dbus calls
      * Used by resources_find_service_class() when resource class=service
      */
     unit = systemd_unit_by_name(name, NULL);
     if(unit) {
         free(unit);
         return TRUE;
     }
     return FALSE;
 }
 
 static char *
 systemd_unit_metadata(const char *name)
 {
     char *meta = NULL;
     char *desc = NULL;
     char *path = systemd_unit_by_name(name, NULL);
 
     if (path) {
         /* TODO: Worth a making blocking call for? Probably not. Possibly if cached. */
         desc = pcmk_dbus_get_property(systemd_proxy, BUS_NAME, path, BUS_NAME ".Unit", "Description", NULL, NULL);
     } else {
         desc = crm_strdup_printf("Systemd unit file for %s", name);
     }
 
     meta = crm_strdup_printf("<?xml version=\"1.0\"?>\n"
                            "<!DOCTYPE resource-agent SYSTEM \"ra-api-1.dtd\">\n"
                            "<resource-agent name=\"%s\" version=\"0.1\">\n"
                            "  <version>1.0</version>\n"
                            "  <longdesc lang=\"en\">\n"
                            "    %s\n"
                            "  </longdesc>\n"
                            "  <shortdesc lang=\"en\">systemd unit file for %s</shortdesc>\n"
                            "  <parameters>\n"
                            "  </parameters>\n"
                            "  <actions>\n"
                            "    <action name=\"start\"   timeout=\"15\" />\n"
                            "    <action name=\"stop\"    timeout=\"15\" />\n"
                            "    <action name=\"status\"  timeout=\"15\" />\n"
                            "    <action name=\"restart\"  timeout=\"15\" />\n"
                            "    <action name=\"monitor\" timeout=\"15\" interval=\"15\" start-delay=\"15\" />\n"
                            "    <action name=\"meta-data\"  timeout=\"5\" />\n"
                            "  </actions>\n"
                            "  <special tag=\"systemd\">\n"
                            "  </special>\n" "</resource-agent>\n", name, desc, name);
     free(desc);
     free(path);
     return meta;
 }
 
 static bool
 systemd_mask_error(svc_action_t *op, const char *error)
 {
     crm_trace("Could not issue %s for %s: %s", op->action, op->rsc, error);
     if(strstr(error, "org.freedesktop.systemd1.InvalidName")
        || strstr(error, "org.freedesktop.systemd1.LoadFailed")
        || strstr(error, "org.freedesktop.systemd1.NoSuchUnit")) {
 
         if (safe_str_eq(op->action, "stop")) {
             crm_trace("Masking %s failure for %s: unknown services are stopped", op->action, op->rsc);
             op->rc = PCMK_OCF_OK;
 
         } else {
             crm_trace("Mapping %s failure for %s: unknown services are not installed", op->action, op->rsc);
             op->rc = PCMK_OCF_NOT_INSTALLED;
             op->status = PCMK_LRM_OP_NOT_INSTALLED;
         }
         return TRUE;
     }
 
     return FALSE;
 }
 
 static void
 systemd_exec_result(DBusMessage *reply, svc_action_t *op)
 {
     DBusError error;
 
     if(pcmk_dbus_find_error(op->action, (void*)&error, reply, &error)) {
 
         /* ignore "already started" or "not running" errors */
         if (!systemd_mask_error(op, error.name)) {
             crm_err("Could not issue %s for %s: %s (%s)", op->action, op->rsc, error.message);
         }
 
     } else {
         if(!pcmk_dbus_type_check(reply, NULL, DBUS_TYPE_OBJECT_PATH, __FUNCTION__, __LINE__)) {
             crm_warn("Call to %s passed but return type was unexpected", op->action);
             op->rc = PCMK_OCF_OK;
 
         } else {
             const char *path = NULL;
 
             dbus_message_get_args (reply, NULL,
                                    DBUS_TYPE_OBJECT_PATH, &path,
                                    DBUS_TYPE_INVALID);
             crm_info("Call to %s passed: %s", op->action, path);
             op->rc = PCMK_OCF_OK;
         }
     }
 
     operation_finalize(op);
 }
 
 static void
 systemd_async_dispatch(DBusPendingCall *pending, void *user_data)
 {
     DBusError error;
     DBusMessage *reply = NULL;
     svc_action_t *op = user_data;
 
     dbus_error_init(&error);
     if(pending) {
         reply = dbus_pending_call_steal_reply(pending);
     }
 
     if(op) {
         crm_trace("Got result: %p for %p for %s, %s", reply, pending, op->rsc, op->action);
         op->opaque->pending = NULL;
         systemd_exec_result(reply, op);
 
     } else {
         crm_trace("Got result: %p for %p", reply, pending);
     }
 
     if(pending) {
         dbus_pending_call_unref(pending);
     }
     if(reply) {
         dbus_message_unref(reply);
     }
 }
 
 #define SYSTEMD_OVERRIDE_ROOT "/run/systemd/system/"
 
 static void
 systemd_unit_check(const char *name, const char *state, void *userdata)
 {
     svc_action_t * op = userdata;
 
     crm_trace("Resource %s has %s='%s'", op->rsc, name, state);
 
     if(state == NULL) {
         op->rc = PCMK_OCF_NOT_RUNNING;
 
     } else if (g_strcmp0(state, "active") == 0) {
         op->rc = PCMK_OCF_OK;
     } else if (g_strcmp0(state, "activating") == 0) {
         op->rc = PCMK_OCF_PENDING;
     } else if (g_strcmp0(state, "deactivating") == 0) {
         op->rc = PCMK_OCF_PENDING;
     } else {
         op->rc = PCMK_OCF_NOT_RUNNING;
     }
 
     if (op->synchronous == FALSE) {
         op->opaque->pending = NULL;
         operation_finalize(op);
     }
 }
 
 gboolean
 systemd_unit_exec_with_unit(svc_action_t * op, const char *unit)
 {
     const char *method = op->action;
     DBusMessage *msg = NULL;
     DBusMessage *reply = NULL;
 
     CRM_ASSERT(unit);
 
     if (unit == NULL) {
         crm_debug("Could not obtain unit named '%s'", op->agent);
         op->rc = PCMK_OCF_NOT_INSTALLED;
         op->status = PCMK_LRM_OP_NOT_INSTALLED;
         goto cleanup;
     }
 
     if (safe_str_eq(op->action, "monitor") || safe_str_eq(method, "status")) {
         char *state = pcmk_dbus_get_property(systemd_proxy, BUS_NAME, unit, BUS_NAME ".Unit", "ActiveState",
                                              op->synchronous?NULL:systemd_unit_check, op);
         if (op->synchronous) {
             systemd_unit_check("ActiveState", state, op);
             free(state);
             return op->rc == PCMK_OCF_OK;
         }
         return TRUE;
 
     } else if (g_strcmp0(method, "start") == 0) {
         FILE *file_strm = NULL;
-        char *override_dir = crm_strdup_printf("%s/%s", SYSTEMD_OVERRIDE_ROOT, unit);
-        char *override_file = crm_strdup_printf("%s/%s/50-pacemaker.conf", SYSTEMD_OVERRIDE_ROOT, unit);
+        char *override_dir = crm_strdup_printf("%s/%s.service.d", SYSTEMD_OVERRIDE_ROOT, op->agent);
+        char *override_file = crm_strdup_printf("%s/%s.service.d/50-pacemaker.conf", SYSTEMD_OVERRIDE_ROOT, op->agent);
 
         method = "StartUnit";
         crm_build_path(override_dir, 0755);
 
         file_strm = fopen(override_file, "w");
         if (file_strm != NULL) {
-            int rc = fprintf(file_strm, "[Service]\nRestart=no");
+            /* TODO: Insert the start timeout in too */
+            char *override = crm_strdup_printf(
+                "[Unit]\n"
+                "Description=Cluster Controlled %s\n"
+                "Before=pacemaker.service\n"
+                "\n"
+                "[Service]\n"
+                "Restart=no\n",
+                op->agent);
+
+            int rc = fprintf(file_strm, "%s\n", override);
+
+            free(override);
             if (rc < 0) {
                 crm_perror(LOG_ERR, "Cannot write to systemd override file %s", override_file);
             }
 
         } else {
             crm_err("Cannot open systemd override file %s for writing", override_file);
         }
 
         if (file_strm != NULL) {
             fflush(file_strm);
             fclose(file_strm);
         }
         systemd_daemon_reload();
         free(override_file);
         free(override_dir);
 
     } else if (g_strcmp0(method, "stop") == 0) {
-        char *override_file = crm_strdup_printf("%s/%s/50-pacemaker.conf", SYSTEMD_OVERRIDE_ROOT, unit);
+        char *override_file = crm_strdup_printf("%s/%s.service.d/50-pacemaker.conf", SYSTEMD_OVERRIDE_ROOT, op->agent);
 
         method = "StopUnit";
         unlink(override_file);
         free(override_file);
         systemd_daemon_reload();
 
     } else if (g_strcmp0(method, "restart") == 0) {
         method = "RestartUnit";
 
     } else {
         op->rc = PCMK_OCF_UNIMPLEMENT_FEATURE;
         goto cleanup;
     }
 
     crm_debug("Calling %s for %s: %s", method, op->rsc, unit);
 
     msg = systemd_new_method(BUS_NAME".Manager", method);
     CRM_ASSERT(msg != NULL);
 
     /* (ss) */
     {
         const char *replace_s = "replace";
         char *name = systemd_service_name(op->agent);
 
         CRM_LOG_ASSERT(dbus_message_append_args(msg, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID));
         CRM_LOG_ASSERT(dbus_message_append_args(msg, DBUS_TYPE_STRING, &replace_s, DBUS_TYPE_INVALID));
 
         free(name);
     }
 
     if (op->synchronous == FALSE) {
         DBusPendingCall* pending = pcmk_dbus_send(msg, systemd_proxy, systemd_async_dispatch, op);
 
         dbus_message_unref(msg);
         if(pending) {
             dbus_pending_call_ref(pending);
             op->opaque->pending = pending;
             return TRUE;
         }
         return FALSE;
 
     } else {
         DBusError error;
 
         reply = pcmk_dbus_send_recv(msg, systemd_proxy, &error);
         dbus_message_unref(msg);
         systemd_exec_result(reply, op);
 
         if(reply) {
             dbus_message_unref(reply);
         }
         return FALSE;
     }
 
   cleanup:
     if (op->synchronous == FALSE) {
         operation_finalize(op);
         return TRUE;
     }
 
     return op->rc == PCMK_OCF_OK;
 }
 
 static gboolean
 systemd_timeout_callback(gpointer p)
 {
     svc_action_t * op = p;
 
     op->opaque->timerid = 0;
     crm_warn("%s operation on systemd unit %s named '%s' timed out", op->action, op->agent, op->rsc);
     operation_finalize(op);
 
     return FALSE;
 }
 
 gboolean
 systemd_unit_exec(svc_action_t * op)
 {
     char *unit = NULL;
 
     CRM_ASSERT(op);
     CRM_ASSERT(systemd_init());
     op->rc = PCMK_OCF_UNKNOWN_ERROR;
     crm_debug("Performing %ssynchronous %s op on systemd unit %s named '%s'",
               op->synchronous ? "" : "a", op->action, op->agent, op->rsc);
 
     if (safe_str_eq(op->action, "meta-data")) {
         /* TODO: See if we can teach the lrmd not to make these calls synchronously */
         op->stdout_data = systemd_unit_metadata(op->agent);
         op->rc = PCMK_OCF_OK;
 
         if (op->synchronous == FALSE) {
             operation_finalize(op);
         }
         return TRUE;
     }
 
     unit = systemd_unit_by_name(op->agent, op);
     free(unit);
 
     if (op->synchronous == FALSE) {
         op->opaque->timerid = g_timeout_add(op->timeout + 5000, systemd_timeout_callback, op);
         return TRUE;
     }
 
     return op->rc == PCMK_OCF_OK;
 }