diff --git a/sesman/sessionrecord.c b/sesman/sessionrecord.c
index 22dbd3d8..2d0d8400 100644
--- a/sesman/sessionrecord.c
+++ b/sesman/sessionrecord.c
@@ -69,7 +69,7 @@ add_xtmp_entry(int pid, const char *line, const char *user, const char *rhostnam
         i--;
     }
 
-    hostname = strndup(rhostname, i);
+    hostname = g_strndup(rhostname, i);
 
     memset(&ut, 0, sizeof(ut));
 
@@ -97,6 +97,7 @@ add_xtmp_entry(int pid, const char *line, const char *user, const char *rhostnam
     log_message(LOG_LEVEL_DEBUG, "HAVE_UTMP_H");
     updwtmp("/var/log/wtmp", &ut);
 #endif
+    g_free(hostname);
 
     return 0;
 }