diff --git a/include/mod_carboncopy.hrl b/include/mod_carboncopy.hrl
index 1da76ffbc..321c24e58 100644
--- a/include/mod_carboncopy.hrl
+++ b/include/mod_carboncopy.hrl
@@ -18,9 +18,10 @@
 %%%
 %%%----------------------------------------------------------------------
 
--type matchspec_atom() :: '_' | '$1' | '$2' | '$3'.
+-type matchspec_atom() :: '_' | '$1' | '$2' | '$3' | '$4'.
 -record(carboncopy, {us       :: {binary(), binary()} | matchspec_atom(), 
 		     resource :: binary() | matchspec_atom(),
-		     version  :: binary() | matchspec_atom()}).
+		     version  :: binary() | matchspec_atom(),
+		     node = node() :: node() | matchspec_atom()}).
 
 -define(CARBONCOPY_CACHE, carboncopy_cache).
diff --git a/src/mod_carboncopy_mnesia.erl b/src/mod_carboncopy_mnesia.erl
index 62355165e..8b248a2de 100644
--- a/src/mod_carboncopy_mnesia.erl
+++ b/src/mod_carboncopy_mnesia.erl
@@ -62,14 +62,15 @@ disable(LUser, LServer, LResource) ->
     ToDelete = mnesia:dirty_match_object(
 		 #carboncopy{us = {LUser, LServer},
 			     resource = LResource,
-			     version = '_'}),
+			     _ = '_'}),
     lists:foreach(fun mnesia:dirty_delete_object/1, ToDelete).
 
 list(LUser, LServer) ->
     {ok, mnesia:dirty_select(
 	   carboncopy,
-	   [{#carboncopy{us = {LUser, LServer}, resource = '$2', version = '$3'},
-	     [], [{{'$2','$3', node()}}]}])}.
+	   [{#carboncopy{us = {LUser, LServer}, resource = '$2',
+			 version = '$3', node = '$4'},
+	     [], [{{'$2','$3','$4'}}]}])}.
 
 use_cache(_LServer) ->
     false.
diff --git a/src/mod_carboncopy_riak.erl b/src/mod_carboncopy_riak.erl
new file mode 100644
index 000000000..f8cb62019
--- /dev/null
+++ b/src/mod_carboncopy_riak.erl
@@ -0,0 +1,82 @@
+%%%-------------------------------------------------------------------
+%%% @author Evgeny Khramtsov <ekhramtsov@process-one.net>
+%%% Created : 15 Apr 2017 by Evgeny Khramtsov <ekhramtsov@process-one.net>
+%%%
+%%%
+%%% ejabberd, Copyright (C) 2002-2017   ProcessOne
+%%%
+%%% 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 Street, Fifth Floor, Boston, MA 02110-1301 USA.
+%%%
+%%%-------------------------------------------------------------------
+-module(mod_carboncopy_riak).
+-behaviour(mod_carboncopy).
+
+%% API
+-export([init/2, enable/4, disable/3, list/2]).
+
+-include("logger.hrl").
+-include("mod_carboncopy.hrl").
+
+%%%===================================================================
+%%% API
+%%%===================================================================
+init(_Host, _Opts) ->
+    clean_table().
+
+enable(LUser, LServer, LResource, NS) ->
+    ejabberd_riak:put(#carboncopy{us = {LUser, LServer},
+				  resource = LResource,
+				  version = NS},
+		      carboncopy_schema(),
+		      [{i, {LUser, LServer, LResource}},
+		       {'2i', [{<<"us">>, {LUser, LServer}}]}]).
+
+disable(LUser, LServer, LResource) ->
+    ejabberd_riak:delete(carboncopy, {LUser, LServer, LResource}).
+
+list(LUser, LServer) ->
+    case ejabberd_riak:get_by_index(
+	   carboncopy, carboncopy_schema(),
+	   <<"us">>, {LUser, LServer}) of
+	{ok, Rs} ->
+	    {ok, [{Resource, NS, Node}
+		  || #carboncopy{resource = Resource,
+				 version = NS,
+				 node = Node} <- Rs]};
+	{error, _} = Err ->
+	    Err
+    end.
+
+%%%===================================================================
+%%% Internal functions
+%%%===================================================================
+carboncopy_schema() ->
+    {record_info(fields, carboncopy), #carboncopy{}}.
+
+clean_table() ->
+    ?INFO_MSG("Cleaning Riak 'carboncopy' table...", []),
+    case ejabberd_riak:get(carboncopy, carboncopy_schema()) of
+	{ok, Rs} ->
+	    lists:foreach(
+	      fun(#carboncopy{us = {U, S}, resource = R, node = Node})
+		    when Node == node() ->
+		      ejabberd_riak:delete(carboncopy, {U, S, R});
+		 (_) ->
+		      ok
+	      end, Rs);
+	{error, Reason} = Err ->
+	    ?ERROR_MSG("Failed to clean Riak 'carboncopy' table: ~p", [Reason]),
+	    Err
+    end.
diff --git a/test/ejabberd_SUITE.erl b/test/ejabberd_SUITE.erl
index 54501d177..17465617b 100644
--- a/test/ejabberd_SUITE.erl
+++ b/test/ejabberd_SUITE.erl
@@ -404,13 +404,15 @@ db_tests(riak) ->
        vcard_tests:single_cases(),
        muc_tests:single_cases(),
        offline_tests:single_cases(),
+       carbons_tests:single_cases(),
        test_unregister]},
      muc_tests:master_slave_cases(),
      privacy_tests:master_slave_cases(),
      roster_tests:master_slave_cases(),
      offline_tests:master_slave_cases(),
      vcard_tests:master_slave_cases(),
-     announce_tests:master_slave_cases()];
+     announce_tests:master_slave_cases(),
+     carbons_tests:master_slave_cases()];
 db_tests(DB) when DB == mnesia; DB == redis ->
     [{single_user, [sequence],
       [test_register,
diff --git a/test/ejabberd_SUITE_data/ejabberd.yml b/test/ejabberd_SUITE_data/ejabberd.yml
index 24509737e..f7e45c879 100644
--- a/test/ejabberd_SUITE_data/ejabberd.yml
+++ b/test/ejabberd_SUITE_data/ejabberd.yml
@@ -334,6 +334,8 @@ Welcome to this XMPP server."
         db_type: riak
       mod_vcard_xupdate:
         db_type: riak
+      mod_carboncopy:
+        ram_db_type: riak
       mod_adhoc: []
       mod_configure: []
       mod_disco: []