diff --git a/squashfs-retval.patch b/squashfs-retval.patch
index 4dd3478..c1c4917 100644
--- a/squashfs-retval.patch
+++ b/squashfs-retval.patch
@@ -1,6 +1,4 @@
-Index: squashfs-tools/mksquashfs.c
-===================================================================
---- squashfs-tools/mksquashfs.c.orig
+--- squashfs-tools/mksquashfs.c
 +++ squashfs-tools/mksquashfs.c
 @@ -1538,6 +1538,7 @@ int add_pending_fragment(struct file_buf
  	pthread_mutex_lock(&fragment_mutex);
diff --git a/squashfs-tools.tar.bz2 b/squashfs-tools.tar.bz2
deleted file mode 100644
index 1784eb7..0000000
--- a/squashfs-tools.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ca5306cd7dcae5a523a4ffd37e5afbf15c0e73272d4a55f49930febfa205b8da
-size 45324
diff --git a/squashfs.changes b/squashfs.changes
index 581321d..7354879 100644
--- a/squashfs.changes
+++ b/squashfs.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Sep 21 14:47:01 CEST 2009 - snwint@suse.de
+
+- removed obsolete source file
+
+-------------------------------------------------------------------
+Thu Sep 17 12:49:44 CEST 2009 - snwint@suse.de
+
+- update to squashfs 4.0 (unsquashfs actually works)
+
 -------------------------------------------------------------------
 Wed Feb 25 16:27:55 CET 2009 - coolo@suse.de
 
diff --git a/squashfs.spec b/squashfs.spec
index 836b6e5..1bc6041 100644
--- a/squashfs.spec
+++ b/squashfs.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package squashfs (Version 3.99cvs20090225)
+# spec file for package squashfs (Version 4.0)
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,16 +17,15 @@
 
 # norootforbuild
 
-# Commandline: 
 
 Name:           squashfs
 BuildRequires:  zlib-devel
-License:        GPL v2 or later
+License:        GPLv2+
 Group:          System/Filesystems
 Supplements:    filesystem(squashfs)
-Version:        3.99cvs20090225
+Version:        4.0
 Release:        1
-Source0:        squashfs-tools.tar.bz2
+Source0:        squashfs4.0.tar.gz
 Patch:          squashfs-retval.patch
 Url:            http://squashfs.sourceforge.net/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -43,61 +42,22 @@ Authors:
     Phillip Lougher
 
 %prep
-%setup -n squashfs-tools
-%patch -p1
+%setup -n squashfs%{version}
+%patch -p0
 
 %build
-make CFLAGS="-I. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE $RPM_OPT_FLAGS"
+make -C squashfs-tools CFLAGS="-I. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE $RPM_OPT_FLAGS"
 
 %install
 mkdir -p $RPM_BUILD_ROOT/usr/bin
-cp -p {un,mk}squashfs $RPM_BUILD_ROOT/usr/bin
-#chmod 644 *READ* *CHANGE*
+install -m 755 squashfs-tools/{un,mk}squashfs $RPM_BUILD_ROOT/usr/bin
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-#%doc README CHANGES PERFORMANCE.README
+%doc README README-4.0 PERFORMANCE.README CHANGES
 /usr/bin/*squashfs
 
 %changelog
-* Wed Feb 25 2009 coolo@suse.de
-- update to squashfs pre 4.0 to create squashfs that 2.6.29 can
-  actually read
-- (there is no documentation in CVS)
-* Thu Aug 23 2007 olh@suse.de
-- move kernel driver to kernel-binary.rpm
-* Thu Aug 16 2007 cthiel@suse.de
-- Supplements: filesystem(squashfs)
-* Wed Jun 06 2007 ro@suse.de
-- fix build with current kernel
-* Wed Apr 04 2007 lrupp@suse.de
-- added module-init-tools to BuildRequires
-* Thu Mar 29 2007 rguenther@suse.de
-- added zlib-devel BuildRequires.
-* Tue Jan 23 2007 ro@suse.de
-- update to 3.2r2
-  - Kernel patches 2.6.19/2.6.20 have been updated to use
-  const structures and mutexes rather than older semaphores.
-  - Minor SMP bug fixes.
-  - Progress bar broken on x86-64.  Fixed.
-- update to 3.2
-  - Improvements:
-    - Squashfs filesystems can now be exported via NFS.
-    - Unsquashfs now supports 2.x filesystems.
-    - Mksquashfs now displays a progress bar.
-    - Squashfs kernel code has been hardened against accidently or
-  maliciously corrupted Squashfs filesystems.
-  - Bug fixes:
-    - Race condition occurring on S390 in readpage() fixed.
-    - Odd behaviour of MIPS memcpy in read_data() routine worked-around.
-    - Missing cache_flush in Squashfs symlink_readpage() added.
-- update to 3.1r2
-  - A code optimisation after testing unfortunately
-  broke sorting in Mksquashfs.  This has been fixed.
-* Mon Aug 21 2006 ro@suse.de
-- update to version 3.1 to fix build on 2.6.18
-* Thu May 11 2006 duwe@suse.de
-- packaged current version for SuSE Linux.
diff --git a/squashfs4.0.tar.gz b/squashfs4.0.tar.gz
new file mode 100644
index 0000000..d0d972c
--- /dev/null
+++ b/squashfs4.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:18948edbe06bac2c4307eea99bfb962643e4b82e5b7edd541b4d743748e12e21
+size 103979