diff --git a/src/pw3270/common/Makefile.in b/src/pw3270/common/Makefile.in
index 064cedf..657122f 100644
--- a/src/pw3270/common/Makefile.in
+++ b/src/pw3270/common/Makefile.in
@@ -39,6 +39,7 @@ exec_prefix=@exec_prefix@
 bindir=@bindir@
 sbindir=@sbindir@
 libdir=@libdir@
+datarootdir=@datarootdir@
 
 BASEDIR=@BASEDIR@
 SRCDIR=$(BASEDIR)/.src/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/src/pw3270/$(MODULE_NAME)
@@ -63,6 +64,7 @@ CFLAGS= \
 	@LIBV3270_CFLAGS@ \
 	@PW3270_CFLAGS@ \
 	-Wno-deprecated-declarations \
+	-DDATAROOTDIR=\"$(datarootdir)\" \
 	@GTK_CFLAGS@ 
 
 LIBS= \
diff --git a/src/pw3270/common/config.c b/src/pw3270/common/config.c
index 53f085a..31152e4 100644
--- a/src/pw3270/common/config.c
+++ b/src/pw3270/common/config.c
@@ -223,7 +223,7 @@
 	// Search the application DATADIR
 	//
 	{
-		gchar *filename = g_build_filename(G_STRINGIFY(DATADIR),name,NULL);
+		gchar *filename = g_build_filename(DATAROOTDIR,PACKAGE_NAME,name,NULL);
 
 		trace("Checking for %s",filename);
 
@@ -641,6 +641,17 @@ gchar * filename_from_va(const gchar *first_element, va_list args)
 	}
 #endif // HAVE_WIN_REGISTRY
 
+#ifdef _WIN32
+	for(p=0;p<G_N_ELEMENTS(appname) && !result;p++)
+	{
+		gchar * path = g_build_filename(g_win32_get_package_installation_directory_of_module(NULL),appname[p],suffix,NULL);
+		trace("searching \"%s\"",path);
+		if(g_file_test(path,G_FILE_TEST_EXISTS))
+			return path;
+		g_free(path);
+	}
+#endif // _WIN32
+
 	// Check system data dirs
 	const gchar * const * system_data_dirs = g_get_system_data_dirs();
 	for(p=0;p<G_N_ELEMENTS(appname);p++)
--
libgit2 0.21.2