diff --git a/Makefile.in b/Makefile.in
index 2d397ff..4dd104f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -73,6 +73,17 @@ AMTAR=@AMTAR@
 
 #---[ Rules ]------------------------------------------------------------------
 
+%.tar.bz2: %.tar
+	@echo "  GEN  `basename $@`"
+	@bzip2 --compress -9 --stdout $< > $@
+	@chmod 666 $@
+
+%.tar.gz: %.tar
+	@echo "  GEN  `basename $@`"
+	@gzip -9 --stdout $< > $@
+	@chmod 666 $@
+
+
 src/pw3270/%.png: src/pw3270/pixmaps/%.svg
 ifneq ($(CONVERT),no)
 	@echo "  GEN  `basename $@`"
@@ -158,10 +169,12 @@ endif
 
 tgz: $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz
 
-rpm: $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz
+bz2: $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2
+
+rpm: $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2
 ifneq ($(RPMBUILD),no)
 	@$(MKDIR) $(PWD)/$(TMPDIR)/rpmbuild
-	@TMPDIR=$(PWD)/$(TMPDIR)/rpmbuild rpmbuild -ta --clean $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz
+	@TMPDIR=$(PWD)/$(TMPDIR)/rpmbuild rpmbuild -ta --clean $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2
 	@rm -fr $(PWD)/$(TMPDIR)/rpmbuild
 endif
 
@@ -186,7 +199,7 @@ $(TMPDIR)/$(PACKAGE_NAME).pot: $(BINDIR)/pot/pw3270.pot $(BINDIR)/pot/lib3270.po
 
 pixmaps: src/pw3270/$(PACKAGE_NAME).png src/pw3270/$(PACKAGE_NAME)-logo.png
 
-$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz: clean pixmaps
+$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar: clean pixmaps
 	@rm -fr $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
 	@$(MKDIR) $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
 	@cp *.m4 $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
@@ -205,7 +218,7 @@ $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz: clean pixmaps
 	@$(MKDIR) $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/po
 	@cp po/*.po $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/po
 
-	@$(AMTAR) --create --gzip --directory $(TMPDIR) --exclude-vcs --owner=root --group=root --file=$@ $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
+	@$(AMTAR) --create --directory $(TMPDIR) --exclude-vcs --owner=root --group=root --file=$@ $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
 
 	@rm -fr $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
 	@echo $@
@@ -257,6 +270,7 @@ distclean: clean
 	@rm -f src/pw3270/uiparser/Makefile
 	@rm -fr autom4te.cache
 	@rm -f *.pc
+	@rm -f $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar*
 
 	@rm -f Makefile
 
diff --git a/pw3270.spec.in b/pw3270.spec.in
index 1658743..08732ca 100644
--- a/pw3270.spec.in
+++ b/pw3270.spec.in
@@ -67,7 +67,7 @@ Group:          System/X11/Terminals
 Version:        @PACKAGE_VERSION@
 Release:        %_release
 Summary:        IBM 3270 Terminal emulator for gtk
-Source:         %{name}-%{version}.tar.gz
+Source:         %{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       openssl shared-mime-info
 Distribution:	%_distro
@@ -117,7 +117,7 @@ Revision @PACKAGE_REVISION@ from @PACKAGE_SOURCE@
 find . -exec touch {} \;
 aclocal
 autoconf
-./configure --prefix=%{_prefix} --bindir=%{_bindir} --datadir=%{_datadir} --includedir=%{_includedir} --libdir=%{_libdir}
+./configure --enable-pic --prefix=%{_prefix} --bindir=%{_bindir} --datadir=%{_datadir} --includedir=%{_includedir} --libdir=%{_libdir}
 
 %build
 make clean
--
libgit2 0.21.2