diff --git a/pw3270.spec.in b/pw3270.spec.in
index ee4ab2c..9aa5ca5 100644
--- a/pw3270.spec.in
+++ b/pw3270.spec.in
@@ -131,7 +131,7 @@ autoconf
 export CFLAGS="$RPM_OPT_FLAGS"
 export CXXFLAGS="$RPM_OPT_FLAGS"
 export FFLAGS="$RPM_OPT_FLAGS"
-%configure 
+%configure
 
 %build
 make clean
@@ -188,7 +188,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/@PACKAGE_NAME@/sample/*
 
 %files plugin-dbus
-%{_datadir}/@PACKAGE_NAME@/plugins/dbus3270.so
+%{_libdir}/@PACKAGE_NAME@-plugins/dbus3270.so
 
 #---[ Scripts ]-------------------------------------------------------------------------------------------------------
 
diff --git a/src/plugins/dbus3270/Makefile.in b/src/plugins/dbus3270/Makefile.in
index d5efe2e..cec2739 100644
--- a/src/plugins/dbus3270/Makefile.in
+++ b/src/plugins/dbus3270/Makefile.in
@@ -135,8 +135,8 @@ $(BINDBG)/plugins/$(MODULE_NAME).so: $(foreach SRC, $(basename $(PLUGIN_SRC)), $
 #---[ Misc targets ]-----------------------------------------------------------
 
 install: $(BINRLS)/plugins/$(MODULE_NAME).so
-	@$(MKDIR) $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/plugins
-	@$(INSTALL_PROGRAM) $(BINRLS)/plugins/$(MODULE_NAME).so $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/plugins
+	@$(MKDIR) $(DESTDIR)$(libdir)/$(PACKAGE_NAME)-plugins
+	@$(INSTALL_PROGRAM) $(BINRLS)/plugins/$(MODULE_NAME).so $(DESTDIR)$(libdir)/$(PACKAGE_NAME)-plugins
 
 debug-service: $(BINDBG)/@PACKAGE_NAME@d
 
diff --git a/src/pw3270/Makefile.in b/src/pw3270/Makefile.in
index 8302ddc..f58a140 100644
--- a/src/pw3270/Makefile.in
+++ b/src/pw3270/Makefile.in
@@ -68,7 +68,7 @@ DEPENDS=*.h common/*.h uiparser/*.h v3270/*.h $(GLOBAL_DEPS)
 
 VALGRIND=@VALGRIND@
 
-CFLAGS=@CFLAGS@ @DLL_CFLAGS@ @GTK_CFLAGS@ @GTKMAC_CFLAGS@ -DDATAROOTDIR=\"$(datarootdir)\" -I../../src/include
+CFLAGS=@CFLAGS@ @DLL_CFLAGS@ @GTK_CFLAGS@ @GTKMAC_CFLAGS@ -DLIBDIR=\"$(libdir)\" -DDATAROOTDIR=\"$(datarootdir)\" -I../../src/include
 LIBS=@LIBS@ @GTK_LIBS@ @GTKMAC_LIBS@
 
 #---[ Rules ]------------------------------------------------------------------
diff --git a/src/pw3270/plugin.c b/src/pw3270/plugin.c
index 3fa1b67..18873df 100644
--- a/src/pw3270/plugin.c
+++ b/src/pw3270/plugin.c
@@ -137,9 +137,22 @@
  {
 #if ! defined(DEBUG)
 
-	gchar *path = pw3270_build_filename(widget,"plugins",NULL);
-	load(path, widget);
-	g_free(path);
+	const gchar * appname[]	= { g_get_application_name(), PACKAGE_NAME };
+	int f;
+
+	for(f=0;f<G_N_ELEMENTS(appname);f++)
+	{
+		gchar *path = g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s-plugins",LIBDIR,appname[f]);
+
+		if(g_file_test(path,G_FILE_TEST_IS_DIR))
+		{
+			load(path, widget);
+			g_free(path);
+			return;
+		}
+
+		g_free(path);
+	}
 
 #elif defined( win32 )
 
@@ -166,7 +179,6 @@
 	g_free(dir);
 
 #endif
-
  }
 
  LIB3270_EXPORT void pw3270_deinit_plugins(GtkWidget *widget)
diff --git a/src/sample/Makefile.in b/src/sample/Makefile.in
index f3b6d41..b010940 100644
--- a/src/sample/Makefile.in
+++ b/src/sample/Makefile.in
@@ -3,7 +3,7 @@
 # (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
 # aplicativos mainframe. Registro no INPI sob o nome G3270.
 #
-# Copyright (C) <2008> <Banco do Brasil S.A.>
+#  Copyright (C) <2008> <Banco do Brasil S.A.>
 #
 # Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
 # os termos da GPL v.2 - Licença Pública Geral  GNU,  conforme  publicado  pela
--
libgit2 0.21.2