diff --git a/debian/rules b/debian/rules
index e427317..fa937aa 100644
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@
 export DH_VERBOSE=1
 
 # This is the debhelper compatibility version to use.
-export DH_COMPAT=9	
+export DH_COMPAT=9
 
 # Name of the package
 PACKAGE_NAME=libv3270
@@ -23,12 +23,7 @@ build-stamp:
 	dh_testdir
 
 	# Add here commands to compile the package.
-	aclocal
-	autoconf
-    
-	mkdir -p scripts
-	automake --add-missing 2> /dev/null | true
-    
+	NOCONFIGURE=1 ./autogen.sh 
 	./configure --prefix=/usr
 	make all
 	# --- end custom part for compiling
diff --git a/rpm/_service b/rpm/_service
index 78cbc1f..294d994 100644
--- a/rpm/_service
+++ b/rpm/_service
@@ -41,11 +41,11 @@
 		<param name="outfilename">debian.control</param>
 	</service>
 
-	<service name="extract_file">
+	<!-- service name="extract_file">
 		<param name="archive">*.tar</param>
 		<param name="files">*/debian/rules</param>
 		<param name="outfilename">debian.rules</param>
-	</service>
+	</service -->
 
   	<service name="extract_file">
 		<param name="archive">*.tar</param>
diff --git a/rpm/libv3270.spec b/rpm/libv3270.spec
index 01a7a61..f555c6f 100644
--- a/rpm/libv3270.spec
+++ b/rpm/libv3270.spec
@@ -29,15 +29,14 @@ BuildRequires:  autoconf >= 2.61
 BuildRequires:  automake
 BuildRequires:  binutils
 BuildRequires:  coreutils
+BuildRequires:  libtool
 BuildRequires:  gcc-c++
 BuildRequires:  gettext-devel
 BuildRequires:  m4
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(lib3270) >= 5.4
-%if 0%{?centos_version}
-# CENTOS Genmarshal doesn't depend on python!
-BuildRequires:  python
-%endif
+
+Suggests:       %{name}-config
 
 %description
 
@@ -60,6 +59,16 @@ provides a TN3270 virtual terminal widget for GTK 3.
 
 For more details, see https://softwarepublico.gov.br/social/pw3270/ .
 
+%package config
+Summary:    Configuration files for the 3270 Virtual Terminal library
+BuildArch:  noarch
+Requires:   %{name}-%{_libvrs} = %{version}
+Enhances:   %{_product}
+Conflicts:  libv3270-5_3
+
+%description config
+Originally designed as part of the pw3270 application, this package provides the configuration files required to %{name}.
+
 %package devel
 Summary:    Header files for the 3270 Virtual Terminal library
 Requires:   %{name}-%{_libvrs} = %{version}
@@ -78,22 +87,24 @@ widgets in Glade.
 %prep
 %setup -q
 NOCONFIGURE=1 ./autogen.sh
-%configure --with-release=%{release}
+%configure --with-release=%{release} --disable-static
 
 %build
 make all %{?_smp_mflags}
 
 %install
 %make_install
-%find_lang %{name} langfiles
+%find_lang %{name}-%{MAJOR_VERSION}.%{MINOR_VERSION} langfiles
 
 %files -n %{name}-%{_libvrs} -f langfiles
 %license LICENSE
 %doc AUTHORS README.md
 %{_libdir}/%{name}.so.*
-%{_datadir}/%{_product}/colors.conf
+
+%files config
 %dir %{_datadir}/%{_product}/remap/
-%{_datadir}/%{_product}/remap/*.xml
+%config %{_datadir}/%{_product}/colors.conf
+%config %{_datadir}/%{_product}/remap/*.xml
 
 %files devel
 %{_datadir}/pw3270/pot/*.pot
diff --git a/src/tools/entry.c b/src/tools/entry.c
index cffa31b..54e75f6 100644
--- a/src/tools/entry.c
+++ b/src/tools/entry.c
@@ -140,7 +140,7 @@
 
  }
 
- LIB3270_EXPORT void gtk_entry_bind_to_filechooser(GtkWidget *widget, GtkFileChooserAction action, const gchar *title, const gchar *icon_name, const gchar *pattern, const gchar *name) {
+ LIB3270_EXPORT GtkWidget * gtk_entry_bind_to_filechooser(GtkWidget *widget, GtkFileChooserAction action, const gchar *title, const gchar *icon_name, const gchar *pattern, const gchar *name) {
 
 	gtk_entry_set_icon_from_icon_name(
 		GTK_ENTRY(widget),
--
libgit2 0.21.2