diff --git a/obexd/client/manager.c b/obexd/client/manager.c
index 11657bc..7e1eb1b 100644
--- a/obexd/client/manager.c
+++ b/obexd/client/manager.c
@@ -38,6 +38,7 @@
 #include "transfer.h"
 #include "session.h"
 #include "manager.h"
+#include "opp.h"
 
 #define CLIENT_SERVICE  "org.openobex.client"
 
@@ -559,6 +560,7 @@ static struct target_module {
 	int (*init) (void);
 	void (*exit) (void);
 } targets[] = {
+	{ "opp", opp_init, opp_exit },
 	{ }
 };
 
diff --git a/obexd/client/opp.c b/obexd/client/opp.c
new file mode 100644
index 0000000..be382ef
--- /dev/null
+++ b/obexd/client/opp.c
@@ -0,0 +1,53 @@
+/*
+ *
+ *  OBEX Client
+ *
+ *  Copyright (C) 2011 Intel Corporation
+ *
+ *
+ *  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 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program 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 program; 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 "log.h"
+
+#include "session.h"
+#include "driver.h"
+#include "opp.h"
+
+#define OPP_UUID "00001105-0000-1000-8000-00805f9b34fb"
+
+static struct obc_driver opp = {
+	.service = "OPP",
+	.uuid = OPP_UUID,
+};
+
+int opp_init(void)
+{
+	DBG("");
+
+	return obc_driver_register(&opp);
+}
+
+void opp_exit(void)
+{
+	DBG("");
+
+	obc_driver_unregister(&opp);
+}
diff --git a/obexd/client/opp.h b/obexd/client/opp.h
new file mode 100644
index 0000000..a23e94e
--- /dev/null
+++ b/obexd/client/opp.h
@@ -0,0 +1,25 @@
+/*
+ *
+ *  OBEX Client
+ *
+ *  Copyright (C) 2011 Intel Corporation
+ *
+ *
+ *  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 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program 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 program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+int opp_init(void);
+void opp_exit(void);