diff --git a/Makefile.in b/Makefile.in
index eabeac4..4661b7d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -28,6 +28,7 @@
 
 SONAME=@SONAME@
 LIBNAME=libv3270
+PRODUCT_NAME=@PRODUCT_NAME@
 
 SOURCES= \
 	$(wildcard src/terminal/*.c) \
@@ -77,8 +78,6 @@ datarootdir=@datarootdir@
 localedir=@localedir@
 docdir=@docdir@
 sysconfdir=@sysconfdir@
-datadir=$(datarootdir)/@PRODUCT_NAME@
-confdir=$(sysconfdir)/@PRODUCT_NAME@
 
 BASEDIR=@BASEDIR@
 
@@ -298,11 +297,11 @@ install-shared: \
 		$(DESTDIR)$(libdir)/$(LIBNAME)@DLLEXT@
 
 	# Install default configs
-	@mkdir -p $(DESTDIR)$(datadir)
+	@mkdir -p $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)
 
 	@$(INSTALL_DATA) \
 		conf/colors.conf \
-		$(DESTDIR)$(datadir)/colors.conf
+		$(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/colors.conf
 
 install-static: \
 	$(BINRLS)/static/$(LIBNAME).a
@@ -332,8 +331,8 @@ install-dev: \
 		$(DESTDIR)$(libdir)/pkgconfig/libv3270.pc
 
 	# Install translation files
-	@$(MKDIR) $(DESTDIR)$(datadir)/pot
-	@$(INSTALL_DATA) $(POTDIR)/$(LIBNAME).pot $(DESTDIR)$(datadir)/pot/$(LIBNAME).pot
+	@$(MKDIR) $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/pot
+	@$(INSTALL_DATA) $(POTDIR)/$(LIBNAME).pot $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/pot/$(LIBNAME).pot
 
 install-glade:
 
diff --git a/configure.ac b/configure.ac
index 3982295..27d86de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -101,8 +101,6 @@ case "$host" in
  	s390x-*)
 		CFLAGS="$CFLAGS -pthread"
 		LDFLAGS="$LDFLAGS -pthread"
-		app_cv_datadir="/usr/share"
-		app_cv_confdir="/etc"
 		app_cv_osname="linux"
 		LOGDIR="/var/log"
 		;;
@@ -110,17 +108,12 @@ case "$host" in
  	*)
 		CFLAGS="$CFLAGS -pthread"
 		LDFLAGS="$LDFLAGS -pthread"
-		app_cv_datadir="/usr/share"
-		app_cv_confdir="/etc"
 		app_cv_osname="linux"
 		LOGDIR="/var/log"
 		DLLEXT=".so"
 
 esac
 
-
-AC_SUBST(DATADIR,$app_cv_datadir)
-AC_SUBST(CONFDIR,$app_cv_confdir)
 AC_SUBST(OSNAME,$app_cv_osname)
 AC_SUBST(LIBS)
 AC_SUBST(LOGDIR)
diff --git a/sdk/libv3270.pc.in b/sdk/libv3270.pc.in
index 345fee7..d274b1a 100644
--- a/sdk/libv3270.pc.in
+++ b/sdk/libv3270.pc.in
@@ -9,7 +9,7 @@ version_minor=@PACKAGE_MINOR_VERSION@
 Name: @PACKAGE_NAME@
 Description: @PACKAGE_DESCRIPTION@
 Version: @PACKAGE_VERSION@
-Libs: -L\@libdir@ -lv3270
+Libs: -lv3270
 Libs.private: @LIBS@ @GTK_LIBS@ @GLIB_LIBS@ @LIBICONV@ @INTL_LIBS@ @LIB3270_LIBS@
 Cflags: -I@includedir@
 
--
libgit2 0.21.2