diff --git a/src/sugar3/profile.py b/src/sugar3/profile.py
index a77aef0a..f8b03a5b 100644
--- a/src/sugar3/profile.py
+++ b/src/sugar3/profile.py
@@ -188,7 +188,7 @@ class Profile(object):
             logging.error('Error removing old profile.')
 
     def create_debug_file(self):
-        path = os.path.join(os.path.expanduser('~/.sugar'), 'debug')
+        path = os.path.join(env.get_logs_path(), 'debug')
         fd = open(path, 'w')
         text = '# Uncomment the following lines to turn on many' \
             'sugar debugging\n'\
@@ -196,14 +196,14 @@ class Profile(object):
             '#export LM_DEBUG=net\n' \
             '#export GABBLE_DEBUG=all\n' \
             '#export GABBLE_LOGFILE=' \
-            '$HOME/.sugar/default/logs/telepathy-gabble.log\n' \
+            '$HOME/.sugar/$SUGAR_PROFILE/logs/telepathy-gabble.log\n' \
             '#export SALUT_DEBUG=all\n' \
             '#export SALUT_LOGFILE=' \
-            '$HOME/.sugar/default/logs/telepathy-salut.log\n' \
+            '$HOME/.sugar/$SUGAR_PROFILE/logs/telepathy-salut.log\n' \
             '#export GIBBER_DEBUG=all\n' \
             '#export WOCKY_DEBUG=all\n' \
             '#export MC_LOGFILE=' \
-            '$HOME/.sugar/default/logs/mission-control.log\n' \
+            '$HOME/.sugar/$SUGAR_PROFILE/logs/mission-control.log\n' \
             '#export MC_DEBUG=all\n' \
             '#export PRESENCESERVICE_DEBUG=1\n' \
             '#export SUGAR_LOGGER_LEVEL=debug\n\n' \