diff --git a/misc/Makefile.am b/misc/Makefile.am
index f8eccc8f8..16340a083 100644
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -12,13 +12,13 @@ LIBFILES_OUT = mc.ext
 
 noinst_DATA = xterm.ad
 
-pkgdata_DATA =
+pkgdata_DATA = \
+	mc.lib
 
 LIBFILES_CONST = \
 	cedit.menu      \
 	edit.indent.rc \
 	edit.spell.rc \
-	mc.lib \
 	filehighlight.ini \
 	mc.keymap \
 	mc.keymap.default \
diff --git a/src/setup.c b/src/setup.c
index a0a20487d..e3ab267c7 100644
--- a/src/setup.c
+++ b/src/setup.c
@@ -731,11 +731,11 @@ load_setup (void)
 
     /* mc.lib is common for all users, but has priority lower than
        ~/.mc/ini.  FIXME: it's only used for keys and treestore now */
-    global_profile_name = concat_dir_and_file (mc_home, MC_GLOBAL_CONFIG_FILE);
+    global_profile_name = g_build_filename (mc_home, MC_GLOBAL_CONFIG_FILE, (char *) NULL);
     if (!exist_file (global_profile_name))
     {
         g_free (global_profile_name);
-        global_profile_name = concat_dir_and_file (mc_home_alt, MC_GLOBAL_CONFIG_FILE);
+        global_profile_name = g_build_filename (mc_home_alt, MC_GLOBAL_CONFIG_FILE, (char *) NULL);
     }
 
     panels_profile_name = g_build_filename (home_dir, MC_USERCONF_DIR, MC_PANELS_FILE, NULL);