diff --git a/debian/control b/debian/control
index 643e437..a893bf5 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: admin
 Priority: optional
 Maintainer: Wouter Verhelst <wouter@debian.org>
 Uploaders: Wouter Verhelst <wouter@debian.org>, Stephen R. Marenka <smarenka@debian.org>
-Build-Depends: debhelper (>> 4.1.16), docbook-to-man, gcc-3.3 | gcc-3.4 | gcc-4.1 | gcc-4.4
-Build-Depends-Indep: gcc-3.4-m68k-linux [!m68k] | m68k-linux-gcc [!m68k] | gcc-3.4-m68k-linux-gnu [!m68k] | gcc-4.1-m68k-linux-gnu [!m68k]
+Build-Depends: debhelper (>> 4.1.16), docbook-to-man, gcc, e2fslibs-dev
+Build-Depends-Indep: gcc-4.6-m68k-linux-gnu [!m68k]
 Standards-Version: 3.7.2
 
 Package: emile-bootblocks
diff --git a/libext2/ext2.h b/libext2/ext2.h
index d335ddd..6ff4b22 100644
--- a/libext2/ext2.h
+++ b/libext2/ext2.h
@@ -9,7 +9,7 @@
 
 #include <unistd.h>
 #include <linux/fs.h>
-#include <linux/ext2_fs.h>
+#include <ext2fs/ext2_fs.h>
 
 #include <libstream.h>
 
diff --git a/libext2/ext2_utils.c b/libext2/ext2_utils.c
index 01493f1..6893609 100644
--- a/libext2/ext2_utils.c
+++ b/libext2/ext2_utils.c
@@ -24,9 +24,9 @@ void ext2_get_super(device_io_t *device, struct ext2_super_block *super)
 	super->s_free_inodes_count = __le32_to_cpu(super->s_free_inodes_count);
 	super->s_first_data_block = __le32_to_cpu(super->s_first_data_block);
 	super->s_log_block_size = __le32_to_cpu(super->s_log_block_size);
-	super->s_log_frag_size = __le32_to_cpu(super->s_log_frag_size);
+	super->s_log_cluster_size = __le32_to_cpu(super->s_log_cluster_size);
 	super->s_blocks_per_group = __le32_to_cpu(super->s_blocks_per_group);
-	super->s_frags_per_group = __le32_to_cpu(super->s_frags_per_group);
+	super->s_clusters_per_group = __le32_to_cpu(super->s_clusters_per_group);
 	super->s_inodes_per_group = __le32_to_cpu(super->s_inodes_per_group);
 	super->s_mtime = __le32_to_cpu(super->s_mtime);
 	super->s_wtime = __le32_to_cpu(super->s_wtime);
@@ -150,12 +150,15 @@ int ext2_get_inode(ext2_VOLUME* volume,
 	inode->i_file_acl = __le32_to_cpu(le_inode->i_file_acl);
 	inode->i_dir_acl = __le32_to_cpu(le_inode->i_dir_acl);
 	inode->i_faddr = __le32_to_cpu(le_inode->i_faddr);
-	inode->osd2.linux2.l_i_frag = le_inode->osd2.linux2.l_i_frag;
-	inode->osd2.linux2.l_i_fsize = le_inode->osd2.linux2.l_i_fsize;
+	inode->osd2.linux2.l_i_blocks_hi =
+                       __le16_to_cpu(le_inode->osd2.linux2.l_i_blocks_hi);
+	inode->osd2.linux2.l_i_file_acl_high =
+                       __le16_to_cpu(le_inode->osd2.linux2.l_i_file_acl_high);
 	inode->osd2.linux2.l_i_uid_high =
 			__le16_to_cpu(le_inode->osd2.linux2.l_i_uid_high);
 	inode->osd2.linux2.l_i_gid_high =
 			__le16_to_cpu(le_inode->osd2.linux2.l_i_gid_high);
+
 	return 0;
 }
 
diff --git a/libext2/ext2_utils.h b/libext2/ext2_utils.h
index 3ae0f81..a608c85 100644
--- a/libext2/ext2_utils.h
+++ b/libext2/ext2_utils.h
@@ -8,7 +8,7 @@
 #define __EXT2_UTILS_H__
 
 #include <linux/fs.h>
-#include <linux/ext2_fs.h>
+#include <ext2fs/ext2_fs.h>
 #include <libstream.h>
 #include "ext2.h"
 
diff --git a/tools/ext2_ls.c b/tools/ext2_ls.c
index 1d9eca1..801c5a0 100644
--- a/tools/ext2_ls.c
+++ b/tools/ext2_ls.c
@@ -16,7 +16,7 @@
 
 
 #include <linux/fs.h>
-#include <linux/ext2_fs.h>
+#include <ext2fs/ext2_fs.h>
 #include <libext2.h>
 
 #include "device.h"