diff --git a/Makefile.in b/Makefile.in
index e3105ee..c064e0b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -238,15 +238,13 @@ endif
 
 package: Release
 ifneq ($(MAKENSIS),no)
-	@make -C nsi $(PACKAGE_NAME)-@host_cpu@.nsi
 	@chmod +x makegtkruntime.sh
 	@echo "  GEN  GTK Runtime"
 	@./makegtkruntime.sh
 	@echo "  GEN  Windows installer"
 	@cp -rv $(BINDIR)/Release/$(localedir) $(BINDIR)/Release
-	@cat nsi/$(PACKAGE_NAME)-@host_cpu@.nsi | "$(MAKENSIS)" \
-			-DLOCALEDIR="$(BINDIR)/Release$(localedir)" \
-			-Onsis.log -
+	@make -C nsi package-no-gtk
+	@make -C nsi package
 endif
 
 ifneq ($(DPKGBUILD),no)
diff --git a/nsi/Makefile.in b/nsi/Makefile.in
index b0d7d8c..dac7f2a 100644
--- a/nsi/Makefile.in
+++ b/nsi/Makefile.in
@@ -40,7 +40,7 @@ EXTENSIONS=@EXTENSIONS@
 #---[ Tools ]------------------------------------------------------------------
 
 MAKENSIS=@MAKENSIS@
-
+MKDIR=@MKDIR_P@
 
 #---[ Rules ]------------------------------------------------------------------
 
@@ -56,8 +56,19 @@ $(PACKAGE_NAME).nsi: \
 	$(PACKAGE_NAME)-$(HOST_CPU).nsi
 	@cp $^ $@
 
+package: \
+	$(PACKAGE_NAME)-$(HOST_CPU).nsi
 
-$(PACKAGE_NAME)-$(HOST_CPU).nsi: \
+	@echo "Installer for $(PACKAGE_NAME)-$(HOST_CPU)..."
+	@$(MAKENSIS) $(PACKAGE_NAME)-$(HOST_CPU).nsi
+
+package-no-gtk: \
+	$(PACKAGE_NAME)-$(HOST_CPU)-no-gtk.nsi
+
+	@echo "Installer for $(PACKAGE_NAME)-$(HOST_CPU)-no-gtk..."
+	@$(MAKENSIS) $(PACKAGE_NAME)-$(HOST_CPU)-no-gtk.nsi
+
+.tmp/prefix-$(HOST_CPU).nsi: \
 	header-$(HOST_CPU).nsi \
 	main-begin-$(HOST_CPU).nsi \
 	main-end.nsi \
@@ -66,10 +77,13 @@ $(PACKAGE_NAME)-$(HOST_CPU).nsi: \
 	uninstall-$(HOST_CPU).nsi \
 	oninit-$(HOST_CPU).nsi \
 	$(foreach PLUGIN, $(PLUGINS), $(PLUGIN)-init.nsi ) \
+	$(foreach EXTENSION, $(EXTENSIONS), $(EXTENSION)-extension-init.nsi ) \
 	$(foreach EXTENSION, $(EXTENSIONS), $(EXTENSION)-extension.nsi )
 
+	@$(MKDIR) `dirname $@`
+
 	@rm -f $@
-	@cat header-$(HOST_CPU).nsi		> 	$@
+
 	@cat main-begin-$(HOST_CPU).nsi	>>	$@
 
 	# Install plugins
@@ -80,20 +94,64 @@ $(PACKAGE_NAME)-$(HOST_CPU).nsi: \
 	# Finalize
 
 	@cat main-end.nsi				>>	$@
-	@cat runtime.nsi				>>	$@
+
+
+.tmp/suffix-$(HOST_CPU).nsi: \
+	header-$(HOST_CPU).nsi \
+	main-begin-$(HOST_CPU).nsi \
+	main-end.nsi \
+	runtime.nsi \
+	sdk.nsi \
+	uninstall-$(HOST_CPU).nsi \
+	oninit-$(HOST_CPU).nsi \
+	$(foreach PLUGIN, $(PLUGINS), $(PLUGIN)-init.nsi ) \
+	$(foreach EXTENSION, $(EXTENSIONS), $(EXTENSION)-extension-init.nsi ) \
+	$(foreach EXTENSION, $(EXTENSIONS), $(EXTENSION)-extension.nsi )
+
+	@$(MKDIR) `dirname $@`
+
+	@rm -f $@
+
 	@cat sdk.nsi					>>	$@
 	@cat uninstall-$(HOST_CPU).nsi	>>	$@
 	@cat oninit-$(HOST_CPU).nsi		>>	$@
 
-	# Install plugin scripts
+$(PACKAGE_NAME)-$(HOST_CPU).nsi: \
+	.tmp/prefix-$(HOST_CPU).nsi \
+	.tmp/suffix-$(HOST_CPU).nsi \
+
+	@cat header-$(HOST_CPU).nsi			>  $@
+	@cat .tmp/prefix-$(HOST_CPU).nsi	>> $@
+	@cat runtime.nsi					>> $@
+	@cat .tmp/suffix-$(HOST_CPU).nsi	>> $@
 
 	@cat runtime-init.nsi >> $@
 	@cat $(foreach PLUGIN, $(PLUGINS), $(PLUGIN)-init.nsi ) >> $@
+	@cat $(foreach EXTENSION, $(EXTENSIONS), $(EXTENSION)-extension-init.nsi ) >> $@
 
 	# Finalize onInit script
 
 	@echo FunctionEnd >> $@
 
+
+	@chmod 644 $@	
+
+	@echo $@
+
+$(PACKAGE_NAME)-$(HOST_CPU)-no-gtk.nsi: \
+	.tmp/prefix-$(HOST_CPU).nsi \
+	.tmp/suffix-$(HOST_CPU).nsi \
+
+	@cat header-$(HOST_CPU)-no-gtk.nsi	>  $@
+	@cat .tmp/prefix-$(HOST_CPU).nsi	>> $@
+	@cat .tmp/suffix-$(HOST_CPU).nsi	>> $@
+
+	@cat $(foreach PLUGIN, $(PLUGINS), $(PLUGIN)-init.nsi ) >> $@
+	@cat $(foreach EXTENSION, $(EXTENSIONS), $(EXTENSION)-extension-init.nsi ) >> $@
+
+	# Finalize onInit script
+
+	@echo FunctionEnd >> $@
 	@chmod 644 $@	
 
 	@echo $@
diff --git a/nsi/java-extension-init.nsi b/nsi/java-extension-init.nsi
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/nsi/java-extension-init.nsi
diff --git a/nsi/java-extension.nsi b/nsi/java-extension.nsi
index e69de29..b3f3a48 100644
--- a/nsi/java-extension.nsi
+++ b/nsi/java-extension.nsi
@@ -0,0 +1,8 @@
+		Section /o "Java" JNIModule
+
+			setOutPath $INSTDIR
+			file "/oname=$SYSDIR\jni3270.dll"			"..\.bin\Release\jni3270.dll"
+			file "/oname=$INSTDIR\plugins\j3270.dll"	"..\.bin\Release\plugins\j3270.dll"
+
+		sectionEnd
+
diff --git a/nsi/python-extension-init.nsi b/nsi/python-extension-init.nsi
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/nsi/python-extension-init.nsi
diff --git a/nsi/python-extension.nsi b/nsi/python-extension.nsi
index c48f003..ddba950 100644
--- a/nsi/python-extension.nsi
+++ b/nsi/python-extension.nsi
@@ -1,7 +1,7 @@
 		Section /o "Python" PythonModule
 
 			setOutPath $INSTDIR
-			file "/oname=$SYSDIR\py3270.dll" "..\.bin\Release\py3270.dll"
+			file "/oname=$INSTDIR\py3270.pyd" "..\.bin\Release\py3270.dll"
 
 		sectionEnd
 
diff --git a/nsi/rexx-extension-init.nsi b/nsi/rexx-extension-init.nsi
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/nsi/rexx-extension-init.nsi
diff --git a/po/pt_BR.po b/po/pt_BR.po
index dcba13e..4f2633a 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: 2015-11-03 10:19-0200\n"
+"POT-Creation-Date: 2015-11-03 15:43-0200\n"
 "PO-Revision-Date: 2014-02-17 08:05-0300\n"
 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
 "Language-Team: Portugues <>\n"
diff --git a/winpacket.sh b/winpacket.sh
index 8a788f2..97ad61e 100755
--- a/winpacket.sh
+++ b/winpacket.sh
@@ -28,7 +28,7 @@ failed()
 CopyPacket()
 {
 
-	FILENAME=$(find . -maxdepth 1 -name "*.exe" | head --lines 1 | sed "s@./@@g")
+	FILENAME=$(find nsi -maxdepth 1 -name "*.exe" | head --lines 1 | sed "s@./@@g")
 
 	mkdir -p ${DESTDIR}/${1}
 
@@ -76,9 +76,8 @@ build()
 	./configure \
 		--cache-file=${1}.cache \
 		--host=${host} \
-		--prefix=${prefix} \
-		--disable-java
-
+		--prefix=${prefix}
+ 
 	if [ "$?" != "0" ]; then
 		failed "Erro ao configurar"
 	fi
@@ -108,12 +107,12 @@ build()
 	fi
 
 	echo -e "\e]2;pw3270-install-${host_cpu}.exe\a"
-	cat nsi/pw3270-${host_cpu}.nsi | makensis \
-                -DLOCALEDIR=".bin/Release${prefix}/share/locale" \
-				-
-
-#                -Onsis-${host_cpu}.log -
+	make -C nsi package
+	if [ "$?" != "0" ]; then
+		failed "Erro ao gerar pacote windows"
+	fi
 
+	make -C nsi package-no-gtk
 	if [ "$?" != "0" ]; then
 		failed "Erro ao gerar pacote windows"
 	fi
--
libgit2 0.21.2