diff --git a/plugins/mod_sipwise_pushd.lua b/plugins/mod_sipwise_pushd.lua
index b4bea22..0360721 100644
--- a/plugins/mod_sipwise_pushd.lua
+++ b/plugins/mod_sipwise_pushd.lua
@@ -6,6 +6,7 @@
 --
 
 module:depends("sipwise_vcard_cusax");
+module:depends("sipwise_pushd_blocking");
 
 local datamanager = require "util.datamanager";
 local mod_sql = module:require("sql");
@@ -19,6 +20,8 @@ local ut = require "util.table";
 local set = require "util.set";
 local st = require "util.stanza";
 
+local pushd_blocking = module:shared("sipwise_pushd_blocking/pushd_blocking");
+
 local pushd_config = {
 	url = "https://127.0.0.1:8080/push",
 	gcm = true,
@@ -202,6 +205,24 @@ local function get_muc_info(stanza, caller_info)
 	end
 end
 
+local function is_pushd_blocked(from, to)
+	local node, host = jid_split(to);
+	local blocked_list = pushd_blocking.get_blocked_jids(node, host);
+
+	module:log("debug", "pushd_blockedlist: %s for [%s]", ut.table.tostring(blocked_list), to);
+
+	local node, host, resource = jid_split(from);
+	if ut.table.contains(blocked_list, from)
+	   or ut.table.contains(blocked_list, jid_bare(from))
+	   or ut.table.contains(blocked_list, host) then
+		return true;
+	end
+	if resource and ut.table.contains(blocked_list, host.."/"..resource) then
+		return true;
+	end
+	return false;
+end
+
 local function handle_offline(event)
 	module:log("debug", "handle_offline");
 	local origin, stanza = event.origin, event.stanza;
@@ -286,6 +307,10 @@ local function handle_offline(event)
 
 	if to then
 		node, host = jid_split(to);
+		if from and is_pushd_blocked(from, to) then
+			module:log("debug", "skip pushd message from blocked jid [%s]", from);
+			return nil;
+		end
 		message = {
 			data_message = get_message(stanza),
 			callee = node,
@@ -318,10 +343,16 @@ local function fire_offline_message(event, muc_room, off_jid)
 
 	module:log("debug", "stanza[%s] stanza_c[%s]",
 		tostring(event.stanza), tostring(stanza_c));
-	module:fire_event('message/offline/handle', {
-		origin = event.origin,
-		stanza = stanza_c,
-	});
+
+	if is_pushd_blocked(stanza_c.attr.from, stanza_c.attr.to) then
+		module:log("debug", "skip pushd message from blocked jid [%s]",
+			stanza_c.attr.from);
+	else
+		module:fire_event('message/offline/handle', {
+			origin = event.origin,
+			stanza = stanza_c,
+		});
+	end
 end
 
 local function handle_muc_offline(event, room_jid)
diff --git a/plugins/mod_sipwise_pushd_blocking.lua b/plugins/mod_sipwise_pushd_blocking.lua
new file mode 100644
index 0000000..fbfb4fd
--- /dev/null
+++ b/plugins/mod_sipwise_pushd_blocking.lua
@@ -0,0 +1,175 @@
+local jid_split = require "util.jid".split;
+local st = require "util.stanza";
+local datamanager = require"util.datamanager";
+
+local xmlns_blocking = "urn:xmpp:pushd_blocking";
+local datastore = "pushd_privacy";
+
+module:add_feature("urn:xmpp:pushd_blocking");
+local pushd_blocking = module:shared("pushd_blocking");
+
+-- Add JID to default privacy list
+local function add_blocked_jid(username, host, jid)
+	local privacy_lists = datamanager.load(username, host, datastore) or {lists = {}};
+	local default_list_name = privacy_lists.default;
+	if not privacy_lists.lists then
+		privacy_lists.lists = {}
+	end
+	if not default_list_name then
+		default_list_name = "blocklist";
+		privacy_lists.default = default_list_name;
+	end
+	local default_list = privacy_lists.lists[default_list_name];
+	if not default_list then
+		default_list = { name = default_list_name, items = {} };
+		privacy_lists.lists[default_list_name] = default_list;
+	end
+	local items = default_list.items;
+	local order = items[1] and items[1].order or 0; -- Must come first
+	for i=1,#items do -- order must be unique
+		local item = items[i];
+		item.order = item.order + 1;
+		if item.type == "jid" and item.action == "deny" and item.value == jid then
+			return false;
+		end
+	end
+	table.insert(items, 1, { type = "jid"
+		, action = "deny"
+		, value = jid
+		, message = false
+		, ["presence-out"] = false
+		, ["presence-in"] = false
+		, iq = false
+		, order = order
+	});
+	datamanager.store(username, host, datastore, privacy_lists);
+	return true;
+end
+
+-- Remove JID from default privacy list
+local function remove_blocked_jid(username, host, jid)
+	local privacy_lists = datamanager.load(username, host, datastore) or {};
+	local default_list_name = privacy_lists.default;
+	if not default_list_name then return; end
+	local default_list = privacy_lists.lists[default_list_name];
+	if not default_list then return; end
+	local items = default_list.items;
+	local item, removed = nil, false;
+	for i=1,#items do -- order must be unique
+		item = items[i];
+		if item.type == "jid" and item.action == "deny" and item.value == jid then
+			table.remove(items, i);
+			removed = true;
+			break;
+		end
+	end
+	if removed then
+		datamanager.store(username, host, datastore, privacy_lists);
+	end
+	return removed;
+end
+
+local function remove_all_blocked_jids(username, host)
+	local privacy_lists = datamanager.load(username, host, datastore) or {};
+	local default_list_name = privacy_lists.default;
+	if not default_list_name then return; end
+	local default_list = privacy_lists.lists[default_list_name];
+	if not default_list then return; end
+	local items = default_list.items;
+	local item;
+	for i=#items,1,-1 do -- order must be unique
+		item = items[i];
+		if item.type == "jid" and item.action == "deny" then
+			table.remove(items, i);
+		end
+	end
+	datamanager.store(username, host, datastore, privacy_lists);
+	return true;
+end
+
+function pushd_blocking.get_blocked_jids(username, host)
+	-- Return array of blocked JIDs in default privacy list
+	local privacy_lists = datamanager.load(username, host, datastore) or {};
+	local default_list_name = privacy_lists.default;
+	if not default_list_name then return {}; end
+	local default_list = privacy_lists.lists[default_list_name];
+	if not default_list then return {}; end
+	local items = default_list.items;
+	local item;
+	local jid_list = {};
+	for i=1,#items do -- order must be unique
+		item = items[i];
+		if item.type == "jid" and item.action == "deny" then
+			jid_list[#jid_list+1] = item.value;
+		end
+	end
+	return jid_list;
+end
+
+local function send_push_iqs(username, host, command_type, jids)
+	local bare_jid = username.."@"..host;
+
+	local stanza_content = st.stanza(command_type, { xmlns = xmlns_blocking });
+	for _, jid in ipairs(jids) do
+		stanza_content:tag("item", { jid = jid }):up();
+	end
+
+	for resource, session in pairs(prosody.bare_sessions[bare_jid].sessions) do
+		local iq_push_stanza = st.iq({ type = "set", to = bare_jid.."/"..resource });
+		iq_push_stanza:add_child(stanza_content);
+		session.send(iq_push_stanza);
+	end
+end
+
+local function handle_blocking_command(event)
+	local session, stanza = event.origin, event.stanza;
+
+	local username, host = jid_split(stanza.attr.from);
+	if stanza.attr.type == "set" then
+		if stanza.tags[1].name == "block" then
+			local block = stanza.tags[1];
+			local block_jid_list = {};
+			for item in block:childtags() do
+				block_jid_list[#block_jid_list+1] = item.attr.jid;
+			end
+			if #block_jid_list == 0 then
+				session.send(st.error_reply(stanza, "modify", "bad-request"));
+			else
+				for _, jid in ipairs(block_jid_list) do
+					add_blocked_jid(username, host, jid);
+				end
+				session.send(st.reply(stanza));
+				send_push_iqs(username, host, "block", block_jid_list);
+			end
+			return true;
+		elseif stanza.tags[1].name == "unblock" then
+			local unblock = stanza.tags[1];
+			local unblock_jid_list = {};
+			for item in unblock:childtags() do
+				unblock_jid_list[#unblock_jid_list+1] = item.attr.jid;
+			end
+			if #unblock_jid_list == 0 then
+				remove_all_blocked_jids(username, host);
+			else
+				for _, jid_to_unblock in ipairs(unblock_jid_list) do
+					remove_blocked_jid(username, host, jid_to_unblock);
+				end
+			end
+			session.send(st.reply(stanza));
+			send_push_iqs(username, host, "unblock", unblock_jid_list);
+			return true;
+		end
+	elseif stanza.attr.type == "get" and stanza.tags[1].name == "blocklist" then
+		local reply = st.reply(stanza):tag("blocklist", { xmlns = xmlns_blocking });
+		local blocked_jids = pushd_blocking.get_blocked_jids(username, host);
+		for _, jid in ipairs(blocked_jids) do
+			reply:tag("item", { jid = jid }):up();
+		end
+		session.send(reply);
+		return true;
+	end
+end
+
+module:hook("iq/self/urn:xmpp:pushd_blocking:blocklist", handle_blocking_command);
+module:hook("iq/self/urn:xmpp:pushd_blocking:block", handle_blocking_command);
+module:hook("iq/self/urn:xmpp:pushd_blocking:unblock", handle_blocking_command);