diff --git a/src/ejabberd_config.erl b/src/ejabberd_config.erl
index 6e7385811..75d56509e 100644
--- a/src/ejabberd_config.erl
+++ b/src/ejabberd_config.erl
@@ -69,8 +69,7 @@ start() ->
     State0 = read_file(Config),
     State = validate_opts(State0),
     %% This start time is used by mod_last:
-    {MegaSecs, Secs, _} = now(),
-    UnixTime = MegaSecs*1000000 + Secs,
+    UnixTime = p1_time_compat:system_time(seconds),
     SharedKey = case erlang:get_cookie() of
                     nocookie ->
                         p1_sha:sha(randoms:get_string());
diff --git a/src/ejabberd_odbc_sup.erl b/src/ejabberd_odbc_sup.erl
index fa4485348..de2ffead8 100644
--- a/src/ejabberd_odbc_sup.erl
+++ b/src/ejabberd_odbc_sup.erl
@@ -102,7 +102,7 @@ get_pids(Host) ->
 get_random_pid(Host) ->
     case get_pids(Host) of
       [] -> none;
-      Pids -> lists:nth(erlang:phash(now(), length(Pids)), Pids)
+      Pids -> lists:nth(erlang:phash(p1_time_compat:unique_integer(), length(Pids)), Pids)
     end.
 
 add_pid(Host, Pid) ->
diff --git a/src/mod_caps.erl b/src/mod_caps.erl
index eb886b19a..f2eeb4903 100644
--- a/src/mod_caps.erl
+++ b/src/mod_caps.erl
@@ -648,7 +648,7 @@ gb_trees_fold_iter(F, Acc, Iter) ->
     end.
 
 now_ts() ->
-    {MegaSecs, Secs, _} = now(), MegaSecs * 1000000 + Secs.
+    {MegaSecs, Secs, _} = p1_time_compat:system_time(seconds).
 
 is_valid_node(Node) ->
     case str:tokens(Node, <<"#">>) of
diff --git a/src/mod_offline.erl b/src/mod_offline.erl
index c41770d32..dca3996f4 100644
--- a/src/mod_offline.erl
+++ b/src/mod_offline.erl
@@ -309,7 +309,7 @@ store_packet(From, To, Packet) ->
 		    case check_event(From, To, Packet) of
 			true ->
 			    #jid{luser = LUser, lserver = LServer} = To,
-			    TimeStamp = now(),
+			    TimeStamp = p1_time_compat:timestamp(),
 			    #xmlel{children = Els} = Packet,
 			    Expire = find_x_expire(TimeStamp, Els),
 			    gen_mod:get_module_proc(To#jid.lserver, ?PROCNAME) !
@@ -441,7 +441,7 @@ pop_offline_messages(Ls, LUser, LServer, mnesia) ->
 	end,
     case mnesia:transaction(F) of
       {atomic, Rs} ->
-	  TS = now(),
+	  TS = p1_time_compat:timestamp(),
 	  Ls ++
 	    lists:map(fun (R) ->
 			      offline_msg_to_route(LServer, R)
@@ -487,7 +487,7 @@ pop_offline_messages(Ls, LUser, LServer, riak) ->
                   fun(#offline_msg{timestamp = T}) ->
                           ok = ejabberd_riak:delete(offline_msg, T)
                   end, Rs),
-                TS = now(),
+                TS = p1_time_compat:timestamp(),
                 Ls ++ lists:map(
                         fun (R) ->
                                 offline_msg_to_route(LServer, R)
@@ -513,7 +513,7 @@ remove_expired_messages(Server) ->
 			    gen_mod:db_type(LServer, ?MODULE)).
 
 remove_expired_messages(_LServer, mnesia) ->
-    TimeStamp = now(),
+    TimeStamp = p1_time_compat:timestamp(),
     F = fun () ->
 		mnesia:write_lock_table(offline_msg),
 		mnesia:foldl(fun (Rec, _Acc) ->
@@ -538,8 +538,7 @@ remove_old_messages(Days, Server) ->
 			gen_mod:db_type(LServer, ?MODULE)).
 
 remove_old_messages(Days, _LServer, mnesia) ->
-    {MegaSecs, Secs, _MicroSecs} = now(),
-    S = MegaSecs * 1000000 + Secs - 60 * 60 * 24 * Days,
+    S = p1_time_compat:system_time(seconds) - 60 * 60 * 24 * Days,
     MegaSecs1 = S div 1000000,
     Secs1 = S rem 1000000,
     TimeStamp = {MegaSecs1, Secs1, 0},
@@ -949,7 +948,7 @@ get_messages_subset2(Max, Length, MsgsAll, DBType)
     MsgsLastN = lists:nthtail(Length - FirstN - FirstN,
 			      Msgs2),
     NoJID = jid:make(<<"...">>, <<"...">>, <<"">>),
-    IntermediateMsg = #offline_msg{timestamp = now(),
+    IntermediateMsg = #offline_msg{timestamp = p1_time_compat:timestamp(),
 				   from = NoJID, to = NoJID,
 				   packet =
 				       #xmlel{name = <<"...">>, attrs = [],
@@ -1113,7 +1112,7 @@ import(LServer) ->
                        {_, _, _} = Now ->
                            Now;
                        undefined ->
-                           now()
+                           p1_time_compat:timestamp()
                    end,
               Expire = find_x_expire(TS, El#xmlel.children),
               #offline_msg{us = {LUser, LServer},