diff --git a/android/Makefile b/android/Makefile
index 56d796f..da54487 100644
--- a/android/Makefile
+++ b/android/Makefile
@@ -36,10 +36,11 @@ ANT=/usr/bin/ant
 ANDROIDSDK=/opt/android-sdk
 
 NDKBUILD=/opt/android-ndk-r8/ndk-build
-CLASSPATH=br/com/bb/pw3270
 MKDIR=/bin/mkdir -p
 CONVERT=rsvg-convert
-JAVASRCDIR=src/br/com/bb/pw3270
+
+CLASSPATH=br/com/bb/pw3270
+JAVASRCDIR=src/$(CLASSPATH)
 
 RESOLUTION=xhdpi mdpi ldpi hdpi
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 6babbac..0da59c1 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pw3270 5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-07 14:57-0300\n"
+"POT-Creation-Date: 2012-08-09 16:58-0300\n"
 "PO-Revision-Date: 2012-08-03 08:52-0300\n"
 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
 "Language-Team: Português do Brasil <>\n"
@@ -145,7 +145,7 @@ msgstr "Cancelado pelo usuário"
 msgid "Cannot create socket handle"
 msgstr "Não foi possível criar um manipulador de socket"
 
-#: session.c:324
+#: session.c:323
 #, c-format
 msgid "Cannot find charset \"%s\", using defaults"
 msgstr "Não encontrei codificação \"%s\", usando defaults"
diff --git a/pw3270.nsi.in b/pw3270.nsi.in
index a42799e..5bac02f 100644
--- a/pw3270.nsi.in
+++ b/pw3270.nsi.in
@@ -103,8 +103,8 @@ SubSection "@PACKAGE@" SecMain
 		WriteRegStr HKCU "Software\@PACKAGE@" "" $INSTDIR
 
 		# Main library
-		file "/oname=$SYSDIR\lib3270.dll"	".bin\Release\lib\lib3270.dll"
-		file "/oname=$SYSDIR\libpw3270.dll"	".bin\Release\lib\libpw3270.dll"
+		file "/oname=$SYSDIR\lib3270.dll"	".bin\Release\lib3270.dll"
+		file "/oname=$SYSDIR\libpw3270.dll"	".bin\Release\libpw3270.dll"
 
 	sectionEnd
 
@@ -141,20 +141,12 @@ Section /o "Software Development Kit" SecSDK
 	CreateDirectory "$INSTDIR\sdk\include\lib3270"
 
 	file "/oname=$INSTDIR\sdk\include\lib3270.h" "src\include\lib3270.h"
+	file "/oname=$INSTDIR\sdk\include\pw3270.h" "src\include\pw3270.h"
+	file "/oname=$INSTDIR\sdk\include\v3270.h" "src\include\v3270.h"
+
 	file "/oname=$INSTDIR\sdk\include\lib3270\config.h" "src\include\lib3270\config.h"
 	file "/oname=$INSTDIR\sdk\include\lib3270\rules.mak" "src\include\rules.mak"
 
-	file "/oname=$INSTDIR\sdk\include\lib3270\config.h"	"src\include\lib3270\config.h"
-	file "/oname=$INSTDIR\sdk\include\lib3270\macros.h"	"src\include\lib3270\macros.h"
-	file "/oname=$INSTDIR\sdk\include\lib3270\selection.h"	"src\include\lib3270\selection.h"
-	file "/oname=$INSTDIR\sdk\include\lib3270\v3270.h"	"src\include\lib3270\v3270.h"
-	file "/oname=$INSTDIR\sdk\include\lib3270\actions.h"  	"src\include\lib3270\actions.h"  
-	file "/oname=$INSTDIR\sdk\include\lib3270\html.h"	"src\include\lib3270\html.h"          
-	file "/oname=$INSTDIR\sdk\include\lib3270\log.h"	"src\include\lib3270\log.h"        
-	file "/oname=$INSTDIR\sdk\include\lib3270\popup.h"	"src\include\lib3270\popup.h"   
-	file "/oname=$INSTDIR\sdk\include\lib3270\session.h"	"src\include\lib3270\session.h"
-	file "/oname=$INSTDIR\sdk\include\lib3270\trace.h"	"src\include\lib3270\trace.h"
-
 SectionEnd
 
 # create a section to define what the uninstaller does.
--
libgit2 0.21.2