diff --git a/Makefile.am b/Makefile.am
index 827ec51d..a9ea953f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -299,6 +299,9 @@ endif
 builtin_modules += smart_messaging
 builtin_sources += plugins/smart-messaging.c
 
+builtin_modules += push_notification
+builtin_sources += plugins/push-notification.c
+
 sbin_PROGRAMS = src/ofonod
 
 src_ofonod_SOURCES = $(gdbus_sources) $(builtin_sources) src/ofono.ver \
diff --git a/plugins/push-notification.c b/plugins/push-notification.c
new file mode 100644
index 00000000..d209fa1c
--- /dev/null
+++ b/plugins/push-notification.c
@@ -0,0 +1,151 @@
+/*
+ *
+ *  oFono - Open Source Telephony
+ *
+ *  Copyright (C) 2008-2010  Intel Corporation. All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  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 <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <errno.h>
+#include <glib.h>
+#include <gdbus.h>
+#include <ofono.h>
+
+#define OFONO_API_SUBJECT_TO_CHANGE
+#include <ofono/plugin.h>
+#include <ofono/log.h>
+#include <ofono/modem.h>
+#include <ofono/dbus.h>
+
+#define PUSH_NOTIFICATION_INTERFACE "org.ofono.PushNotification"
+
+static unsigned int modemwatch_id;
+
+struct push_notification {
+	struct ofono_modem *modem;
+	struct ofono_sms *sms;
+};
+
+static DBusMessage *push_notification_register_agent(DBusConnection *conn,
+						DBusMessage *msg, void *data)
+{
+	return __ofono_error_not_implemented(msg);
+}
+
+static DBusMessage *push_notification_unregister_agent(DBusConnection *conn,
+						DBusMessage *msg, void *data)
+{
+	return __ofono_error_not_implemented(msg);
+}
+
+static GDBusMethodTable push_notification_methods[] = {
+	{ "RegisterAgent",    "o",   "",  push_notification_register_agent },
+	{ "UnregisterAgent",  "o",   "",  push_notification_unregister_agent },
+	{ }
+};
+
+static void push_notification_cleanup(gpointer user)
+{
+	struct push_notification *pn = user;
+
+	DBG("%p", pn);
+}
+
+static void sms_watch(struct ofono_atom *atom,
+				enum ofono_atom_watch_condition cond,
+				void *data)
+{
+	struct push_notification *pn = data;
+	DBusConnection *conn = ofono_dbus_get_connection();
+
+	if (cond == OFONO_ATOM_WATCH_CONDITION_UNREGISTERED) {
+		DBG("unregistered");
+		pn->sms = NULL;
+
+		g_dbus_unregister_interface(conn,
+					ofono_modem_get_path(pn->modem),
+					PUSH_NOTIFICATION_INTERFACE);
+
+		ofono_modem_remove_interface(pn->modem,
+						PUSH_NOTIFICATION_INTERFACE);
+		return;
+	}
+
+	DBG("registered");
+	pn->sms = __ofono_atom_get_data(atom);
+
+	if (!g_dbus_register_interface(conn, ofono_modem_get_path(pn->modem),
+					PUSH_NOTIFICATION_INTERFACE,
+					push_notification_methods, NULL, NULL,
+					pn, push_notification_cleanup)) {
+		ofono_error("Could not create %s interface",
+				PUSH_NOTIFICATION_INTERFACE);
+
+		return;
+	}
+
+	ofono_modem_add_interface(pn->modem, PUSH_NOTIFICATION_INTERFACE);
+}
+
+static void modem_watch(struct ofono_modem *modem, gboolean added, void *user)
+{
+	struct push_notification *pn;
+	DBG("modem: %p, added: %d", modem, added);
+
+	if (added == FALSE)
+		return;
+
+	pn = g_try_new0(struct push_notification, 1);
+	if (pn == NULL)
+		return;
+
+	pn->modem = modem;
+	__ofono_modem_add_atom_watch(modem, OFONO_ATOM_TYPE_SMS,
+					sms_watch, pn, g_free);
+}
+
+static void call_modemwatch(struct ofono_modem *modem, void *user)
+{
+	modem_watch(modem, TRUE, user);
+}
+
+static int push_notification_init()
+{
+	DBG("");
+
+	modemwatch_id = __ofono_modemwatch_add(modem_watch, NULL, NULL);
+
+	__ofono_modem_foreach(call_modemwatch, NULL);
+
+	return 0;
+}
+
+static void push_notification_exit()
+{
+	DBG("");
+
+	__ofono_modemwatch_remove(modemwatch_id);
+}
+
+OFONO_PLUGIN_DEFINE(push_notification, "Push Notification Plugin", VERSION,
+			OFONO_PLUGIN_PRIORITY_DEFAULT,
+			push_notification_init, push_notification_exit)