diff --git a/src/ejabberd_app.erl b/src/ejabberd_app.erl
index d20e6cd99..7ea43fc2c 100644
--- a/src/ejabberd_app.erl
+++ b/src/ejabberd_app.erl
@@ -61,7 +61,7 @@ start(normal, _Args) ->
     cyrsasl:start(),
     % Profiling
     %ejabberd_debug:eprof_start(),
-    %fprof:trace([start, {file, "/tmp/fprof"}, {procs, ejabberd_debug:pids()}]),
+    %ejabberd_debug:fprof_start(),
     maybe_add_nameservers(),
     start_modules(),
     ejabberd_listener:start_listeners(),
diff --git a/src/ejabberd_debug.erl b/src/ejabberd_debug.erl
index 62641d6f5..f2152d851 100644
--- a/src/ejabberd_debug.erl
+++ b/src/ejabberd_debug.erl
@@ -26,16 +26,20 @@
 
 -module(ejabberd_debug).
 
--export([eprof_start/0, stop/0]).
+-export([eprof_start/0, fprof_start/0, stop/0]).
 -export([pids/0]).
 
 eprof_start() ->
     eprof:start(),
     eprof:profile(pids()).
 
+fprof_start() ->
+    fprof:trace([start, {file, "/tmp/fprof"}, {procs, pids()}]).
+
 %% Stop all profilers
 stop() ->
     catch eprof:stop(),
+    catch fprof:stop(),
     ok.
 
 pids() ->