diff --git a/Makefile.in b/Makefile.in
index 4dd104f..c8ac35f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -45,6 +45,7 @@ datarootdir=@datarootdir@
 localedir=@localedir@
 docdir=@docdir@
 sysconfdir=@sysconfdir@
+mandir=@mandir@
 
 BINDIR=.bin
 EXEEXT=@EXEEXT@
@@ -205,12 +206,12 @@ $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar: clean pixmaps
 	@cp *.m4 $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
 	@NOCONFIGURE=1 ./autogen.sh $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
 	@cp configure.ac $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
-	@cp configure $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
+#	@cp configure $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
 	@cp *.in $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
 	@cp AUTHORS LICENSE $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
 	@cp -r src $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
 	@cp -r scripts $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
-	@cp $(PACKAGE_TARNAME).spec $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
+#	@cp $(PACKAGE_TARNAME).spec $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
 
 	@$(MKDIR) $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/ui
 	@cp ui/* $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/ui
@@ -218,12 +219,15 @@ $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar: clean pixmaps
 	@$(MKDIR) $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/po
 	@cp po/*.po $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/po
 
+	@$(MKDIR) $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/man
+	@cp -r man/* $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/man
+
 	@$(AMTAR) --create --directory $(TMPDIR) --exclude-vcs --owner=root --group=root --file=$@ $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
 
 	@rm -fr $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
 	@echo $@
 
-install: install-sdk install-lib install-app
+install: install-sdk install-lib install-app install-man
 
 install-app: install-locale
 	@$(MAKE) BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(RLSLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/pw3270 install
@@ -238,6 +242,14 @@ locale: $(foreach SRC, $(basename $(LANG_FILES)), $(SRC).po)
 install-locale: $(foreach MO, $(basename $(LANG_FILES)), $(BINDIR)/Release/$(localedir)/$(notdir $(MO))/LC_MESSAGES/$(PACKAGE_NAME).mo)
 	@echo -e $(foreach MO, $(notdir $(basename $(LANG_FILES))), mkdir -p $(DESTDIR)/$(localedir)/$(MO)/LC_MESSAGES\\n$(INSTALL_DATA) $(BINDIR)/Release/$(localedir)/$(MO)/LC_MESSAGES/$(PACKAGE_NAME).mo $(DESTDIR)/$(localedir)/$(MO)/LC_MESSAGES/$(PACKAGE_NAME).mo \\n ) | $(SHELL)
 
+
+install-man: 
+	@$(MKDIR) $(DESTDIR)$(mandir)/man1
+	@$(INSTALL_DATA) man/man1/pw3270.1 $(DESTDIR)/$(mandir)/man1/pw3270.1
+	@$(MKDIR) $(DESTDIR)$(mandir)/man5
+	@$(INSTALL_DATA) man/man5/pw3270.5 $(DESTDIR)/$(mandir)/man5/pw3270.5
+
+
 install-sdk:
 	@$(MKDIR) $(DESTDIR)$(includedir)/lib3270
 	@$(INSTALL_DATA) src/include/lib3270.h $(DESTDIR)/$(includedir)
diff --git a/configure.ac b/configure.ac
index 136477b..d1e12bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,7 +90,7 @@ AC_SUBST(PACKAGE_SOURCE,"SVN_URL")
 #--[ Set host based options ]---------------------------------------------------------------------------------------------------------------------------------
 
 DLL_CFLAGS=""
-DLL_FLAGS="-shared -Wl,-soname,\$(@F)"
+DLL_FLAGS="-shared"
 SOCKET_LIBS=""
 LIB3270_REQUIRES=""
 
@@ -111,6 +111,7 @@ case "$host" in
 		EXEEXT=".exe"
 		SOCKET_LIBS="-lws2_32"
 		CFLAGS="$CFLAGS -mms-bitfields"
+		DLL_FLAGS="-shared -Wl,-soname,\$(@F)"
 		AC_PATH_TOOL([STRIP], [strip])
 		;;
 
@@ -280,6 +281,7 @@ AC_CONFIG_FILES([
 	src/pw3270/uiparser/Makefile
 	src/pw3270/common/common.h
 	src/tools/Makefile
+	man/Makefile
 
 ])
 
diff --git a/man/Makefile.in b/man/Makefile.in
new file mode 100644
index 0000000..96d59f1
--- /dev/null
+++ b/man/Makefile.in
@@ -0,0 +1 @@
+man_MANS = pw3270.1 pw3270.5
diff --git a/man/man1/pw3270.1 b/man/man1/pw3270.1
new file mode 100644
index 0000000..e6b3c31
--- /dev/null
+++ b/man/man1/pw3270.1
@@ -0,0 +1,62 @@
+.\" Process this file with
+.\" groff -man -Tascii foo.1
+.\"
+.TH PW3270 1 "JUNE 2012" pw3270 "User Manual"
+.SH NAME
+pw3270 \- a modern tn3270 emulator
+.SH SYNOPSIS
+.B pw3270 [-a
+.I application-name
+.B ] [-h 
+.I hostname:port
+.B ]
+.SH DESCRIPTION
+.B pw3270 
+is a modern, GTK-based, completely free tn3270 emulator. 
+
+Based on the original x3270 code by Paul Mattes, it was created originally for Banco do Brasil. It's now an official Brazilian Government Public Software project, and is used worldwide. 
+
+pw3270 is fully themable, and each element on the screen can be individually customized through the configuration files. It also supports all kinds of TrueType and bitmap fonts that your system already supports, although it's recommended that you select a proportional (monospaced) font.
+
+pw3270 supports many advanced clipboard features, allowing you to copy and paste data on forms, respecting the individual fields and positions on screen.
+
+File transfers are supported, for uploads and downloads.
+
+Printing is implemented using the native GTK print dialogs.
+
+
+In addition to the modern GUI, a development library 
+.BR lib3270 (3)
+has been created to allow you to create your own programs using the 3270 protocol.
+
+.SH OPTIONS
+.IP "--help"
+Shows the available options.
+.IP "-h hostname:port"
+Connects to the host and port specified. Use the form 
+.I "s:hostname:port" 
+for a secure (SSL) connection.
+.IP "-a application-name"
+Specifies an alternate window title. This is useful if you want to name each host window differently (with the service name or host address, for example). The default is to always name the window "pw3270". 
+.SH FILES
+.I /etc/pw3270.conf
+.RS
+The system wide configuration file. See
+.BR pw3270 (5)
+for further details.
+.RE
+.I ~/.config/pw3270.conf
+.RS
+Per user configuration file. See
+.BR pw3270 (5)
+for further details.
+.SH AUTHORS
+Perry Werneck <perry.werneck at gmail dot com>
+
+Erico Mendonca <erico.mendonca at gmail dot com>
+
+The official project page is located at http://www.softwarepublico.gov.br/dotlrn/clubs/pw3270 . 
+
+.SH "SEE ALSO"
+.BR pw3270 (5)
+
diff --git a/man/man5/pw3270.5 b/man/man5/pw3270.5
new file mode 100644
index 0000000..713ba85
--- /dev/null
+++ b/man/man5/pw3270.5
@@ -0,0 +1,50 @@
+.\" Process this file with
+.\" groff -man -Tascii foo.1
+.\"
+.TH PW3270 1 "JUNE 2012" pw3270 "User Manual"
+.SH NAME
+pw3270.conf \- configuration file for pw3270
+.SH SYNOPSIS
+This configuration file can be used to pre-customize some of pw3270's features.
+
+The order of precedence while searching for this file is:
+.IP "/etc/pw3270.conf"
+System-wide configuration.
+
+.IP "~/.config/pw3270.conf"
+User-specific configuration.
+
+.SH SECTIONS
+
+The file follows a windows-style INI file format, with section name headers in square brackets, and parameters in the "name=value" syntax.
+
+.IP "Section: view"
+
+Contains configuration relative to the GUI elements.
+
+.I toolbar.default
+.RS 
+Indicates whether the main toolbar is visible or not. 
+.B Default: true.
+
+.RE
+.IP "Section: host"
+
+Contains configuration relative to the hosts available for the user to connect to.
+
+.I uri
+.RS
+Hostname or IP address, in the format hostname:port. Use s:hostname:port for SSL connections.
+ 
+.RE
+
+.SH AUTHORS
+Perry Werneck <perry.werneck at gmail dot com>
+
+Erico Mendonca <erico.mendonca at gmail dot com>
+
+The official project page is located at http://www.softwarepublico.gov.br/dotlrn/clubs/pw3270 . 
+
+.SH "SEE ALSO"
+.BR pw3270 (1)
+
diff --git a/src/lib3270/tables.c b/src/lib3270/tables.c
index adedcc7..408609f 100644
--- a/src/lib3270/tables.c
+++ b/src/lib3270/tables.c
@@ -1,27 +1,27 @@
-/* 
+/*
  * "Software pw3270, desenvolvido com base nos códigos fontes do WC3270  e X3270
  * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
  * aplicativos mainframe. Registro no INPI sob o nome G3270. Registro no INPI sob o nome G3270.
- * 
+ *
  * 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
  * Free Software Foundation.
- * 
+ *
  * Este programa é distribuído na expectativa de  ser  útil,  mas  SEM  QUALQUER
  * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou  de  ADEQUAÇÃO
  * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
  * obter mais detalhes.
- * 
+ *
  * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
  * programa;  se  não, escreva para a Free Software Foundation, Inc., 59 Temple
  * Place, Suite 330, Boston, MA, 02111-1307, USA
- * 
+ *
  * Este programa está nomeado como tables.c e possui 501 linhas de código.
- * 
- * Contatos: 
- * 
+ *
+ * Contatos:
+ *
  * perry.werneck@gmail.com	(Alexandre Perry de Souza Werneck)
  * erico.mendonca@gmail.com	(Erico Mascarenhas Mendonça)
  * licinio@bb.com.br		(Licínio Luis Branco)
--
libgit2 0.21.2