diff --git a/lib/ext2fs/ChangeLog b/lib/ext2fs/ChangeLog
index c53af802..0653db80 100644
--- a/lib/ext2fs/ChangeLog
+++ b/lib/ext2fs/ChangeLog
@@ -1,5 +1,9 @@
 2000-02-11    <tytso@snap.thunk.org>
 
+	* ext2fs.h: Define EXT2FS_COMPRESSED_BLKADDR and HOLE_BLKADDR.
+		Conditionally include Compression as a supported type if
+		ENABLE_COMPRESSION (via --enable-compression) is turned on.
+
 	* swapfs.c (ext2fs_swap_super): Swap the compression usage bitmap.
 
 2000-02-08    <tytso@snap.thunk.org>
diff --git a/lib/ext2fs/ext2fs.h b/lib/ext2fs/ext2fs.h
index aef2a7cf..489fc508 100644
--- a/lib/ext2fs/ext2fs.h
+++ b/lib/ext2fs/ext2fs.h
@@ -435,6 +435,9 @@ struct ext2fs_sb {
 	__u32	s_reserved[199];	/* Padding to the end of the block */
 };
 
+#define EXT2FS_COMPRESSED_BLKADDR ((blk_t) 0xffffffff)
+#define HOLE_BLKADDR(_b) ((_b) == 0 || (_b) == EXT2FS_COMPRESSED_BLKADDR)
+
 /*
  * Feature set definitions (that might not be in ext2_fs.h
  */
@@ -480,7 +483,14 @@ struct ext2fs_sb {
 #define EXT2_LIB_FEATURE_COMPAT_SUPP	(EXT2_FEATURE_COMPAT_DIR_PREALLOC|\
 					 EXT2_FEATURE_COMPAT_IMAGIC_INODES|\
 					 EXT3_FEATURE_COMPAT_HAS_JOURNAL)
+/* This #ifdef is temporary until compression is fully supported */
+#ifdef ENABLE_COMPRESSION
+#warning "Compression support is experimental"
+#define EXT2_LIB_FEATURE_INCOMPAT_SUPP	(EXT2_FEATURE_INCOMPAT_FILETYPE|\
+					 EXT2_FEATURE_INCOMPAT_COMPRESSION)
+#else
 #define EXT2_LIB_FEATURE_INCOMPAT_SUPP	EXT2_FEATURE_INCOMPAT_FILETYPE
+#endif
 #define EXT2_LIB_FEATURE_RO_COMPAT_SUPP	(EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER|\
 					 EXT2_FEATURE_RO_COMPAT_LARGE_FILE)
 /*