diff --git a/src/pw3270/common/config.c b/src/pw3270/common/config.c
index f64b2ed..4673c88 100644
--- a/src/pw3270/common/config.c
+++ b/src/pw3270/common/config.c
@@ -29,7 +29,13 @@
  *
  */
 
+ #define ENABLE_NLS
+ #define GETTEXT_PACKAGE PACKAGE_NAME
+
+ #include <libintl.h>
+ #include <glib/gi18n.h>
  #include <gtk/gtk.h>
+
  #include "common.h"
  #include <stdarg.h>
  #include <glib/gstdio.h>
@@ -58,7 +64,6 @@
 #else
 
 	static GKeyFile		* program_config = NULL;
- 	static const gchar	* mask = "%s" G_DIR_SEPARATOR_S "%s.conf";
 
 #endif // HAVE_WIN_REGISTRY
 
@@ -192,51 +197,69 @@
  		g_get_user_config_dir,
  		g_get_user_data_dir,
  		g_get_home_dir,
-
 	};
- 	gchar *filename;
- 	int f;
 
-	const gchar * const *sysconfig;
+	size_t f;
+	g_autofree gchar * name = g_strconcat(g_get_application_name(),".conf",NULL);
 
-#ifdef DEBUG
-	filename = g_strdup_printf(mask,".",g_get_application_name());
-	trace("Checking for %s",filename);
-	if(g_file_test(filename,G_FILE_TEST_IS_REGULAR))
-		return filename;
-	g_free(filename);
-#endif
+	//
+	// First search the user data
+	//
 
  	for(f=0;f<G_N_ELEMENTS(dir);f++)
 	{
-		filename = g_strdup_printf(mask,dir[f](),g_get_application_name());
+		gchar *filename = g_build_filename(dir[f](),name,NULL);
+
 		trace("Checking for %s",filename);
+
 		if(g_file_test(filename,G_FILE_TEST_IS_REGULAR))
 			return filename;
 		g_free(filename);
+
 	}
 
-	sysconfig = g_get_system_config_dirs();
- 	for(f=0;sysconfig[f];f++)
+#ifdef DATADIR
+	//
+	// Search the application DATADIR
+	//
 	{
-		filename = g_strdup_printf(mask,sysconfig[f],g_get_application_name());
+		gchar *filename = g_build_filename(G_STRINGIFY(DATADIR),name,NULL);
+
 		trace("Checking for %s",filename);
+
 		if(g_file_test(filename,G_FILE_TEST_IS_REGULAR))
 			return filename;
 		g_free(filename);
+
 	}
+#endif // DATADIR
+
+	//
+	// Search the system folders
+	//
 
-	sysconfig = g_get_system_data_dirs();
+	const gchar * const * sysconfig = g_get_system_config_dirs();
  	for(f=0;sysconfig[f];f++)
 	{
-		filename = g_strdup_printf("%s" G_DIR_SEPARATOR_S PACKAGE_NAME G_DIR_SEPARATOR_S "%s.conf",sysconfig[f],g_get_application_name());
+		gchar *filename = g_build_filename(sysconfig[f],name,NULL);
 		trace("Checking for %s",filename);
 		if(g_file_test(filename,G_FILE_TEST_IS_REGULAR))
 			return filename;
 		g_free(filename);
 	}
 
- 	return g_strdup_printf(mask,g_get_user_config_dir(),g_get_application_name());
+	const gchar * const * sysdata = g_get_system_data_dirs();
+ 	for(f=0;sysdata[f];f++)
+	{
+		gchar *filename = g_build_filename(sysdata[f],name,NULL);
+		trace("Checking for %s",filename);
+		if(g_file_test(filename,G_FILE_TEST_IS_REGULAR))
+			return filename;
+		g_free(filename);
+	}
+
+ 	return g_build_filename(g_get_user_config_dir(),name);
+
  }
 #endif  //  #ifdef HAVE_WIN_REGISTRY
 
@@ -389,6 +412,7 @@ void configuration_init(void)
 
 	if(filename)
 	{
+		g_message(_("Loading %s"),filename);
 		g_key_file_load_from_file(program_config,filename,G_KEY_FILE_NONE,NULL);
 		g_free(filename);
 	}
@@ -530,19 +554,16 @@ void configuration_deinit(void)
 
 	if(text)
 	{
-		gchar *filename = g_strdup_printf(mask,g_get_user_config_dir(),g_get_application_name());
+		g_autofree gchar * name = g_strconcat(g_get_application_name(),".conf",NULL);
+		g_autofree gchar * filename = g_build_filename(g_get_user_config_dir(),name,NULL);
 
 		trace("Saving configuration in \"%s\"",filename);
 
 		g_mkdir_with_parents(g_get_user_config_dir(),S_IRUSR|S_IWUSR);
-
 		g_file_set_contents(filename,text,-1,NULL);
 
-		g_free(filename);
-		g_free(text);
 	}
 
-
 	g_key_file_free(program_config);
 	program_config = NULL;
 
diff --git a/src/pw3270/main.c b/src/pw3270/main.c
index 4d3c69b..7245a84 100644
--- a/src/pw3270/main.c
+++ b/src/pw3270/main.c
@@ -307,7 +307,7 @@ int main(int argc, char *argv[])
 			{ "appname",		'a', 0, G_OPTION_ARG_STRING,	&appname,			N_( "Application name" ),							PACKAGE_NAME					},
 			{ "datadir",		'd', 0, G_OPTION_ARG_CALLBACK,	datadir,			N_( "Path to application data files" ),				NULL         					},
 #endif // WIN32
-			{ "session",		's', 0, G_OPTION_ARG_STRING,	&session_name,		N_( "Session name" ),								NULL							},
+			{ "session",		's', 0, G_OPTION_ARG_STRING,	&session_name,		N_( "Session name" ),								PACKAGE_NAME					},
 			{ "host",			'h', 0, G_OPTION_ARG_STRING,	&host,				N_( "Host to connect"),								host							},
 			{ "colors",			'c', 0, G_OPTION_ARG_CALLBACK,	optcolors,			N_( "Set reported colors (8/16)" ),					"16"							},
             { "systype",		't', 0, G_OPTION_ARG_STRING,	&systype,			N_( "Host system type" ),							"S390"							},
--
libgit2 0.21.2