diff --git a/rpm/_service b/rpm/_service
index 0186f02..d063239 100644
--- a/rpm/_service
+++ b/rpm/_service
@@ -8,7 +8,7 @@
 		<param name="changesgenerate">enable</param>
 		<param name="changesauthor">perry.werneck@gmail.com</param>
       
-		<param name="versionformat">@PARENT_TAG@</param>
+		<param name="versionformat">@PARENT_TAG@+git%cd</param>
 		<param name="scm">git</param>
 	</service>
 
diff --git a/rpm/pw3270.spec b/rpm/pw3270.spec
index fbc00ea..74b6ab2 100644
--- a/rpm/pw3270.spec
+++ b/rpm/pw3270.spec
@@ -22,17 +22,17 @@
 
 #---[ Packaging ]-----------------------------------------------------------------------------------------------------
 
-Name:           pw3270
-Version:        5.3
-Release:        0
-Summary:        IBM 3270 Terminal emulator for GTK
-License:        GPL-2.0
-Group:          System/X11/Terminals
-Url:            https://portal.softwarepublico.gov.br/social/pw3270/
+Name:			pw3270
+Version:		5.3
+Release:		0
+Summary:		IBM 3270 Terminal emulator for GTK
+License:		GPL-2.0
+Group:			System/X11/Terminals
+Url:			https://github.com/PerryWerneck/pw3270
 
-Source:         pw3270-%{version}.tar.xz
+Source:			pw3270-%{version}.tar.xz
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRoot:		%{_tmppath}/%{name}-%{version}-build
 
 Requires:		shared-mime-info
 Requires:		%{name}-branding = %{version}
@@ -41,7 +41,6 @@ BuildRequires:		update-desktop-files
 
 %glib2_gsettings_schema_requires
 
-
 #--[ Setup by distribution ]------------------------------------------------------------------------------------------
 # 
 # References:
@@ -56,7 +55,7 @@ BuildRequires:		update-desktop-files
 BuildRequires:  gtk3-devel
 BuildRequires:  glib2-devel
 BuildRequires:  librsvg2-tools
-BuildRequires:  libv3270-devel >= %{version}
+BuildRequires:  libv3270-devel >= 5.3
 
 %endif
 
@@ -66,7 +65,7 @@ BuildRequires:  libv3270-devel >= %{version}
 
 BuildRequires:  gtk3-devel
 BuildRequires:  glib2-devel
-BuildRequires:  libv3270-devel
+BuildRequires:  libv3270-devel >= 5.3
 
 # Required for genmarshal
 BuildRequires:  python
@@ -79,7 +78,7 @@ BuildRequires:  python
 
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(glib-2.0)
-BuildRequires:  pkgconfig(libv3270) >= %{version}
+BuildRequires:  pkgconfig(libv3270) >= 5.3
 
 %endif
 
@@ -89,7 +88,7 @@ BuildRequires:  pkgconfig(libv3270) >= %{version}
 
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(glib-2.0)
-BuildRequires:  pkgconfig(libv3270) >= %{version}
+BuildRequires:  pkgconfig(libv3270) >= 5.3
 
 %endif
 
@@ -192,6 +191,7 @@ make all -j1
 %{_datadir}/%{_product}/*.png
 %{_datadir}/applications/*.desktop
 %{_datadir}/pixmaps/*.png
+%{_datadir}/mime/packages/*.xml
 
 %files keypads
 %{_datadir}/%{_product}/keypad/*
diff --git a/src/main/main.c b/src/main/main.c
index 86e455e..8b649a4 100644
--- a/src/main/main.c
+++ b/src/main/main.c
@@ -94,6 +94,7 @@ int main (int argc, char **argv) {
 	{
 		g_autofree gchar * appdir = g_win32_get_package_installation_directory_of_module(NULL);
 		g_autofree gchar * locdir = g_build_filename(appdir,"locale",NULL);
+		debug("Locale from \"%s\"\n",locdir);
 		bindtextdomain( PACKAGE_NAME, locdir );
 	}
 #endif // _WIN32
diff --git a/win/pack.sh b/win/pack.sh
index 7141937..f29e33c 100755
--- a/win/pack.sh
+++ b/win/pack.sh
@@ -31,7 +31,10 @@ LIBRARY_NAME="lib3270"
 CORE_LIBRARIES="lib3270 libv3270 libipc3270"
 PACKAGE_PLUGINS=""
 PACKAGE_EXTRAS="libhllapi"
-TARGET_ARCHS="x86_64 x86_32"
+
+#TARGET_ARCHS="x86_64 x86_32"
+TARGET_ARCHS="x86_64"
+
 GIT_URL="https://github.com/PerryWerneck"
 BUILD_UNSTABLE=0
 MAKE_ZIP=0
diff --git a/win/pw3270.nsi.in b/win/pw3270.nsi.in
index b2e1445..049312d 100644
--- a/win/pw3270.nsi.in
+++ b/win/pw3270.nsi.in
@@ -133,7 +133,7 @@ SubSection "@PRODUCT_NAME@" SecMain
 
 		# Locale files
 		CreateDirectory "$INSTDIR\locale\pt_BR\LC_MESSAGES"
-		file "/oname=$INSTDIR\locale\pt_BR\LC_MESSAGES\@PACKAGE@.mo"		"share\locale\pt_BR\LC_MESSAGES\@PACKAGE@.mo"
+		file "/oname=$INSTDIR\locale\pt_BR\LC_MESSAGES\@PACKAGE_NAME@.mo"	"share\locale\pt_BR\LC_MESSAGES\@PACKAGE_NAME@.mo"
 		file "/oname=$INSTDIR\locale\pt_BR\LC_MESSAGES\lib@LIBRARY_NAME@.mo"	"share\locale\pt_BR\LC_MESSAGES\lib@LIBRARY_NAME@.mo"
 		file "/oname=$INSTDIR\locale\pt_BR\LC_MESSAGES\libv3270.mo"		"share\locale\pt_BR\LC_MESSAGES\libv3270.mo"
 
--
libgit2 0.21.2