diff --git a/src/Makefile.am b/src/Makefile.am
index 157fe5bc..e290ee06 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -143,6 +143,7 @@ forked_daapd_SOURCES = main.c \
 	listener.c listener.h \
 	commands.c commands.h \
 	mxml-compat.h \
+	outputs/plist_wrap.h \
 	$(LIBWEBSOCKETS_SRC) \
 	$(GPERF_SRC) \
 	$(ANTLR_SRC) 
diff --git a/src/outputs/plist_wrap.h b/src/outputs/plist_wrap.h
new file mode 100644
index 00000000..0b4d262f
--- /dev/null
+++ b/src/outputs/plist_wrap.h
@@ -0,0 +1,66 @@
+/*
+ * Convenience wrappers for libplist
+ *
+ */
+
+#include <plist/plist.h>
+
+static void
+wplist_dict_add_uint(plist_t node, const char *key, uint64_t val)
+{
+  plist_t add = plist_new_uint(val);
+  plist_dict_set_item(node, key, add);
+}
+
+static void
+wplist_dict_add_string(plist_t node, const char *key, const char *val)
+{
+  plist_t add = plist_new_string(val);
+  plist_dict_set_item(node, key, add);
+}
+
+static void
+wplist_dict_add_bool(plist_t node, const char *key, bool val)
+{
+  plist_t add = plist_new_bool(val);
+  plist_dict_set_item(node, key, add);
+}
+
+static void
+wplist_dict_add_data(plist_t node, const char *key, uint8_t *data, size_t len)
+{
+  plist_t add = plist_new_data((const char *)data, len);
+  plist_dict_set_item(node, key, add);
+}
+
+static int
+wplist_to_bin(uint8_t **data, size_t *len, plist_t node)
+{
+  char *out = NULL;
+  uint32_t out_len = 0;
+
+  plist_to_bin(node, &out, &out_len);
+  if (!out)
+    return -1;
+
+  *data = (uint8_t *)out;
+  *len = out_len;
+
+  return 0;
+}
+
+static int
+wplist_from_evbuf(plist_t *node, struct evbuffer *evbuf)
+{
+  uint8_t *data = evbuffer_pullup(evbuf, -1);
+  size_t len = evbuffer_get_length(evbuf);
+  plist_t out = NULL;
+
+  plist_from_bin((char *)data, (uint32_t)len, &out);
+  if (!out)
+    return -1;
+
+  *node = out;
+
+  return 0;
+}