diff --git a/Makefile.am b/Makefile.am
index e98037c4..8046352b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -88,6 +88,7 @@ dist_sysconf_DATA = src/iwd.conf
 client_iwctl_SOURCES = client/main.c \
 			readline/readline.h readline/history.h \
 			client/adapter.c \
+			client/agent-manager.c \
 			client/command.h client/command.c \
 			client/dbus-proxy.h client/dbus-proxy.c \
 			client/device.h client/device.c \
diff --git a/client/agent-manager.c b/client/agent-manager.c
new file mode 100644
index 00000000..234c1b71
--- /dev/null
+++ b/client/agent-manager.c
@@ -0,0 +1,49 @@
+/*
+ *
+ *  Wireless daemon for Linux
+ *
+ *  Copyright (C) 2017  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser 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 library 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
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <ell/ell.h>
+
+#include "dbus-proxy.h"
+#include "display.h"
+
+static struct proxy_interface_type agent_manager_interface_type = {
+	.interface = "net.connman.iwd.AgentManager",
+};
+
+static int agent_manager_interface_init(void)
+{
+	proxy_interface_type_register(&agent_manager_interface_type);
+
+	return 0;
+}
+
+static void agent_manager_interface_exit(void)
+{
+	proxy_interface_type_register(&agent_manager_interface_type);
+}
+
+INTERFACE_TYPE(agent_manager_interface_type, agent_manager_interface_init,
+						agent_manager_interface_exit)