diff --git a/.gitignore b/.gitignore
index 59dc2dee30..2e9a92d3c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,6 @@
 *.gcno
 *.gcda
 *.la
-*.bz2
 *.gir
 *.typelib
 *.stamp
@@ -32,6 +31,8 @@ valgrind-*.log
 test-*.log
 test-*.trs
 
+/NetworkManager-*.tar.*
+
 /ABOUT-NLS
 /COPYING
 /INSTALL
diff --git a/configure.ac b/configure.ac
index 0a64fadc5b..1adca20c68 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@ AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_REQUIRE_AUX_FILE([tap-driver.sh])
 
-AM_INIT_AUTOMAKE(1.12 tar-ustar no-dist-gzip dist-bzip2 -Wno-portability)  dnl NB: Do not [quote] this parameter.
+AM_INIT_AUTOMAKE(1.12 tar-ustar no-dist-gzip dist-xz -Wno-portability)  dnl NB: Do not [quote] this parameter.
 AM_MAINTAINER_MODE([enable])
 AM_SILENT_RULES([yes])