diff --git a/.gitignore b/.gitignore
index bd2cb8c..d6525da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 squashfs-4.1.tar.bz2
 /squashfs-4.1.tar.bz2
 /squashfs4.1.tar.gz
+/squashfs-4.2-2010-12-23.bz2
+/squashfs-4.2-20101223.bz2
diff --git a/sources b/sources
index 11a79bf..65bc832 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8e1b2b96f5d5f3fe48fef226ae8cd341  squashfs4.1.tar.gz
+8f469886476bf4a7774cb33e04767892  squashfs-4.2-20101223.bz2
diff --git a/squashfs-tools.spec b/squashfs-tools.spec
index 309bb4e..4b2c97d 100644
--- a/squashfs-tools.spec
+++ b/squashfs-tools.spec
@@ -1,11 +1,14 @@
 Summary: Utility for the creation of squashfs filesystems
 Name: squashfs-tools
-Version: 4.1
-Release: 3%{?dist}
+Version: 4.2
+%global cvsdate 20101223
+Release: 0.1.%{cvsdate}%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://squashfs.sf.net
-Source0: http://downloads.sourceforge.net/squashfs/squashfs4.1.tar.gz
+# cvs -z3 -d:pserver:anonymous@squashfs.cvs.sourceforge.net:/cvsroot/squashfs export -D %{cvsdate} -d squashfs-%{version}-%{cvsdate} squashfs
+# tar cfj squashfs-%{version}-%{cvsdate}.bz2 squashfs-%{version}-%{cvsdate}
+Source0: squashfs-%{version}-%{cvsdate}.bz2
 Patch0: squashfs-cflags.patch
 Patch1: squashfs-compressors.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -19,7 +22,7 @@ Squashfs is a highly compressed read-only filesystem for Linux.  This package
 contains the utilities for manipulating squashfs filesystems.
 
 %prep
-%setup -q -n squashfs%{version}
+%setup -q -n squashfs-%{version}-%{cvsdate}
 %patch0 -p0
 %patch1 -p0
 
@@ -38,12 +41,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc ACKNOWLEDGEMENTS CHANGES COPYING DONATIONS INSTALL PERFORMANCE.README README README-4.1 pseudo-file.example
+%doc README
 
 /sbin/mksquashfs
 %{_sbindir}/unsquashfs
 
 %changelog
+* Fri Dec 24 2010 Bruno Wolff III <bruno@wolff.to> - 4.2-0.1.20101223
+* Switch to 4.2 development snapshot to get new XZ support
+* LZMA and XZ (LZMA2) support are now different
+
 * Wed Oct 27 2010 Bruno Wolff III <bruno@wolff.to> - 4.1-3
 - Rebuild for xz soname bump