diff --git a/Makefile.in b/Makefile.in
index 8272a21..58a312e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -46,6 +46,7 @@ sysconfdir=@sysconfdir@
 mandir=@mandir@
 
 BASEDIR=@BASEDIR@
+SRCDIR=$(BASEDIR)/.src/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
 POTDIR=$(BASEDIR)/.pot
 
 BINDIR=$(BASEDIR)/.bin
@@ -59,6 +60,7 @@ INSTALL_DATA=@INSTALL_DATA@
 INSTALL_PROGRAM=@INSTALL_PROGRAM@
 MKDIR=@MKDIR_P@
 MSGCAT=@MSGCAT@
+AMTAR=@AMTAR@
 
 #---[ Rules ]------------------------------------------------------------------
 
@@ -113,6 +115,25 @@ $(DESTDIR)$(libdir)/%@EXEEXT@: \
  
 	@$(MAKE) DESTDIR=$(DESTDIR) -C src/$(basename $(notdir $@)) install
 
+$(SRCDIR)/%: \
+	%/Makefile
+
+	@make -C `dirname $<` $@
+
+%.tar.bz2: \
+	%.tar
+
+	@echo $< ...
+	@bzip2 --compress -9 --stdout $< > $@
+	@chmod 0644 $@
+
+%.tar.gz: \
+	%.tar
+
+	@echo $< ...
+	@gzip -9 --stdout $< > $@
+	@chmod 0644 $@
+
 
 #---[ Release targets ]--------------------------------------------------------
 
@@ -160,8 +181,82 @@ run: \
 
 #---[ Package Targets ]--------------------------------------------------------
 
-
-#---[ Clean Targets ]----------------------------------------------------------
+tgz: \
+        $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz
+
+bz2: \
+        $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2
+
+tar: \
+        $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar
+
+$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar: \
+	$(SRCDIR)
+
+	@$(AMTAR) \
+		--verbose \
+		--format=ustar \
+		--create \
+		--exclude-vcs \
+		--directory $(BASEDIR)/.src \
+		--owner=root \
+		--group=root \
+		--file=$@ \
+		$(PACKAGE_TARNAME)-@PACKAGE_VERSION@
+
+$(SRCDIR): \
+        clean \
+		$(SRCDIR)/ui \
+		$(SRCDIR)/src/lib3270 \
+		$(SRCDIR)/src/pw3270
+
+	@$(MKDIR) $(SRCDIR)
+	@$(INSTALL_DATA) \
+		*.in configure.ac *.cbp LICENCA LICENSE AUTHORS \
+		$(SRCDIR)
+
+	@$(INSTALL_PROGRAM) \
+		autogen.sh \
+		$(SRCDIR)
+
+	@$(MKDIR) $(SRCDIR)/locale
+	@$(INSTALL_DATA) \
+		locale/*.po \
+		locale/*.in \
+		$(SRCDIR)/locale
+
+	@$(MKDIR) $(SRCDIR)/conf
+	@$(INSTALL_DATA) \
+		conf/*.conf \
+		$(SRCDIR)/conf
+
+	@$(MKDIR) $(SRCDIR)/debian
+	@$(INSTALL_DATA) \
+		debian/* \
+		$(SRCDIR)/debian
+
+	@$(INSTALL_DATA) \
+		rpm/*.spec \
+		$(SRCDIR)
+
+	@$(MKDIR) $(SRCDIR)/src/include
+	@$(INSTALL_DATA) \
+		src/include/*.h \
+		$(SRCDIR)/src/include
+
+	@$(MKDIR) $(SRCDIR)/src/include/lib3270
+	@$(INSTALL_DATA) \
+		src/include/lib3270/*.h \
+		src/include/lib3270/*.in \
+		$(SRCDIR)/src/include/lib3270
+
+	@$(MKDIR) $(SRCDIR)/src/include/pw3270
+	@$(INSTALL_DATA) \
+		src/include/pw3270/*.h \
+		$(SRCDIR)/src/include/pw3270
+
+
+#---[ Clean Targets ]----------------------------------------------------------$(
 
 cleanDebug:
 	
@@ -182,6 +277,7 @@ clean: \
 
 	@rm -fr $(BINDIR)
 	@rm -fr $(POTDIR)
+	@rm -fr $(SRCDIR)
 
 
 
diff --git a/locale/pw3270.pot b/locale/pw3270.pot
index a608d1e..3e6ff76 100644
--- a/locale/pw3270.pot
+++ b/locale/pw3270.pot
@@ -9,7 +9,7 @@ msgstr ""
 "#-#-#-#-#  lib3270.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-18 15:27-0200\n"
+"POT-Creation-Date: 2017-01-18 16:20-0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,7 +20,7 @@ msgstr ""
 "#-#-#-#-#  pw3270.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-18 15:27-0200\n"
+"POT-Creation-Date: 2017-01-18 16:20-0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/lib3270/Makefile.in b/src/lib3270/Makefile.in
index f279cf0..c5e3f99 100644
--- a/src/lib3270/Makefile.in
+++ b/src/lib3270/Makefile.in
@@ -47,7 +47,7 @@ sbindir=@sbindir@
 libdir=@libdir@
 
 BASEDIR=@BASEDIR@
-
+SRCDIR=$(BASEDIR)/.src/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/src/lib3270
 POTDIR=$(BASEDIR)/.pot/lib3270
 
 OBJDIR=$(BASEDIR)/.obj/lib3270
@@ -235,6 +235,13 @@ else
 	@cd "$(ROOTDIR)" ; \$(VALGRIND) --leak-check=full --gen-suppressions=all $(BINDBG)/testprogram$(EXEEXT)
 endif
 
+$(SRCDIR): \
+	clean
+
+	@$(MKDIR) $@
+	@$(INSTALL_DATA) *.c *.h *.in *.cbp *.xad *.sh $@
+
+
 #---[ Clean Targets]---------------------------------------------------------------------
 
 cleanDebug:
diff --git a/src/pw3270/Makefile.in b/src/pw3270/Makefile.in
index 7371d6a..47c8026 100644
--- a/src/pw3270/Makefile.in
+++ b/src/pw3270/Makefile.in
@@ -48,7 +48,7 @@ localedir=@localedir@
 desktopdir=$(datarootdir)/applications
 
 BASEDIR=@BASEDIR@
-
+SRCDIR=$(BASEDIR)/.src/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/src/pw3270
 POTDIR=$(BASEDIR)/.pot/$(PACKAGE_TARNAME)
 
 OBJDIR=.obj
@@ -136,6 +136,11 @@ $(POTDIR)/%.pot: \
  
 	@$(MAKE) -C $(basename $(notdir $@)) $@
 
+$(SRCDIR)/%: \
+	%/Makefile
+
+	@make -C `dirname $<` $@
+
 #---[ Release Targets ]------------------------------------------------------------------
 
 all: \
@@ -206,6 +211,14 @@ install: \
 		$(BINRLS)/$(PACKAGE_TARNAME)$(EXEEXT) \
 		$(DESTDIR)$(bindir)
 
+$(SRCDIR): \
+	clean \
+	$(foreach MOD, $(MODULES), $(SRCDIR)/$(MOD))
+
+
+	@$(MKDIR) $@
+	@$(INSTALL_DATA) *.c *.h *.in *.cbp $@
+
 #---[ Debug Targets ]--------------------------------------------------------------------
 
 Debug: \
diff --git a/src/pw3270/common/Makefile.in b/src/pw3270/common/Makefile.in
index 5e8db65..fe8a7b8 100644
--- a/src/pw3270/common/Makefile.in
+++ b/src/pw3270/common/Makefile.in
@@ -41,6 +41,7 @@ sbindir=@sbindir@
 libdir=@libdir@
 
 BASEDIR=@BASEDIR@
+SRCDIR=$(BASEDIR)/.src/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/src/pw3270/$(MODULE_NAME)
 POTDIR=$(BASEDIR)/.pot/$(PACKAGE_TARNAME)/$(MODULE_NAME)
 
 OBJDIR=.obj
@@ -53,6 +54,8 @@ LD=@CC@
 AR=@AR@
 XGETTEXT=@XGETTEXT@
 MSGCAT=@MSGCAT@
+INSTALL=@INSTALL@
+INSTALL_DATA=@INSTALL_DATA@
 
 CFLAGS=@CFLAGS@ @LIB3270_CFLAGS@ -Wno-deprecated-declarations @GTK_CFLAGS@ -I$(BASEDIR)/src/include/pw3270
 LIBS=@LIBS@ @GTK_LIBS@ @LIB3270_LIBS@
@@ -120,6 +123,12 @@ $(BASEDIR)/.pot/$(PACKAGE_TARNAME)/$(MODULE_NAME).pot: \
 	@mkdir -p `dirname $@`
 	@$(MSGCAT) --sort-output $^ > $@
 
+$(SRCDIR): \
+	clean
+
+	@$(MKDIR) $@
+	@$(INSTALL_DATA) *.c *.h *.in $@
+
 #---[ Debug Targets ]--------------------------------------------------------------------
 
 Debug: \
diff --git a/src/pw3270/uiparser/Makefile.in b/src/pw3270/uiparser/Makefile.in
index e4ded40..b20b949 100644
--- a/src/pw3270/uiparser/Makefile.in
+++ b/src/pw3270/uiparser/Makefile.in
@@ -43,6 +43,7 @@ sbindir=@sbindir@
 libdir=@libdir@
 
 BASEDIR=@BASEDIR@
+SRCDIR=$(BASEDIR)/.src/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/src/pw3270/$(MODULE_NAME)
 POTDIR=$(BASEDIR)/.pot/$(PACKAGE_TARNAME)/$(MODULE_NAME)
 
 OBJDIR=.obj
@@ -55,6 +56,8 @@ LD=@CC@
 AR=@AR@
 XGETTEXT=@XGETTEXT@
 MSGCAT=@MSGCAT@
+INSTALL=@INSTALL@
+INSTALL_DATA=@INSTALL_DATA@
 
 CFLAGS=@CFLAGS@ @LIB3270_CFLAGS@ -Wno-deprecated-declarations @GTK_CFLAGS@ -I$(BASEDIR)/src/include/pw3270
 LIBS=@LIBS@ @GTK_LIBS@ @LIB3270_LIBS@
@@ -100,20 +103,6 @@ $(POTDIR)/%.pot: %.c
 
 	@touch $@
 
-marshal.h: \
-	genmarshal
-
-	@echo $< ...
-	@$(MKDIR) `dirname $@`
-	@glib-genmarshal --prefix=v3270 --header genmarshal > $@
-
-marshal.c: \
-	marshal.h
-
-	@echo $< ...
-	@$(MKDIR) `dirname $@`
-	@glib-genmarshal --prefix=v3270 --body genmarshal > $@
-
 #---[ Release Targets ]------------------------------------------------------------------
 
 Release: \
@@ -136,6 +125,12 @@ $(BASEDIR)/.pot/$(PACKAGE_TARNAME)/$(MODULE_NAME).pot: \
 	@mkdir -p `dirname $@`
 	@$(MSGCAT) --sort-output $^ > $@
 
+$(SRCDIR): \
+	clean
+
+	@$(MKDIR) $@
+	@$(INSTALL_DATA) *.c *.h *.in *.cbp $@
+
 #---[ Debug Targets ]--------------------------------------------------------------------
 
 Debug: \
diff --git a/src/pw3270/v3270/Makefile.in b/src/pw3270/v3270/Makefile.in
index ca1aeba..3795338 100644
--- a/src/pw3270/v3270/Makefile.in
+++ b/src/pw3270/v3270/Makefile.in
@@ -42,6 +42,7 @@ sbindir=@sbindir@
 libdir=@libdir@
 
 BASEDIR=@BASEDIR@
+SRCDIR=$(BASEDIR)/.src/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/src/pw3270/$(MODULE_NAME)
 POTDIR=$(BASEDIR)/.pot/$(PACKAGE_TARNAME)/$(MODULE_NAME)
 
 OBJDIR=.obj
@@ -55,6 +56,8 @@ AR=@AR@
 GENMARSHAL=@GENMARSHAL@
 XGETTEXT=@XGETTEXT@
 MSGCAT=@MSGCAT@
+INSTALL=@INSTALL@
+INSTALL_DATA=@INSTALL_DATA@
 
 CFLAGS=@CFLAGS@ @LIB3270_CFLAGS@ -Wno-deprecated-declarations @GTK_CFLAGS@ -I$(BASEDIR)/src/include/pw3270
 LIBS=@LIBS@ @GTK_LIBS@ @LIB3270_LIBS@
@@ -136,6 +139,13 @@ $(BASEDIR)/.pot/$(PACKAGE_TARNAME)/$(MODULE_NAME).pot: \
 	@mkdir -p `dirname $@`
 	@$(MSGCAT) --sort-output $^ > $@
 
+$(SRCDIR): \
+	clean
+
+	@$(MKDIR) $@
+	@$(INSTALL_DATA) *.c *.h *.in *.xbm *.cbp genmarshal $@
+
+
 #---[ Debug Targets ]--------------------------------------------------------------------
 
 Debug: \
diff --git a/src/pw3270/v3270ft/Makefile.in b/src/pw3270/v3270ft/Makefile.in
index 5992480..60490f3 100644
--- a/src/pw3270/v3270ft/Makefile.in
+++ b/src/pw3270/v3270ft/Makefile.in
@@ -42,6 +42,7 @@ sbindir=@sbindir@
 libdir=@libdir@
 
 BASEDIR=@BASEDIR@
+SRCDIR=$(BASEDIR)/.src/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/src/pw3270/$(MODULE_NAME)
 POTDIR=$(BASEDIR)/.pot/$(PACKAGE_TARNAME)/$(MODULE_NAME)
 
 OBJDIR=.obj
@@ -55,6 +56,8 @@ AR=@AR@
 GENMARSHAL=@GENMARSHAL@
 XGETTEXT=@XGETTEXT@
 MSGCAT=@MSGCAT@
+INSTALL=@INSTALL@
+INSTALL_DATA=@INSTALL_DATA@
 
 CFLAGS=@CFLAGS@ @LIB3270_CFLAGS@ -Wno-deprecated-declarations @GTK_CFLAGS@ -I$(BASEDIR)/src/include/pw3270
 LIBS=@LIBS@ @GTK_LIBS@ @LIB3270_LIBS@
@@ -136,6 +139,12 @@ $(BASEDIR)/.pot/$(PACKAGE_TARNAME)/$(MODULE_NAME).pot: \
 	@mkdir -p `dirname $@`
 	@$(MSGCAT) --sort-output $^ > $@
 
+$(SRCDIR): \
+	clean
+
+	@$(MKDIR) $@
+	@$(INSTALL_DATA) *.c *.h *.in *.cbp genmarshal $@
+
 #---[ Debug Targets ]--------------------------------------------------------------------
 
 Debug: \
diff --git a/ui/Makefile.in b/ui/Makefile.in
index 08d4227..491643a 100644
--- a/ui/Makefile.in
+++ b/ui/Makefile.in
@@ -39,6 +39,7 @@ PACKAGE_TARNAME=@PACKAGE_TARNAME@
 
 BASEDIR=@BASEDIR@
 POTDIR=$(BASEDIR)/.pot/ui
+SRCDIR=$(BASEDIR)/.src/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/ui
 
 OBJDIR=.obj
 OBJDBG=$(OBJDIR)/Debug
@@ -105,6 +106,12 @@ install:
 	@$(MKDIR) $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/ui
 	@$(INSTALL_DATA) *.xml $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/ui
 
+$(SRCDIR): \
+	clean
+
+	@$(MKDIR) $@
+	@$(INSTALL_DATA) *.xml *.in *.c $@
+
 pot: \
 	$(BASEDIR)/.pot/ui.pot
 
--
libgit2 0.21.2