diff --git a/sys/conf/files b/sys/conf/files
index 033dab1d0509..54da28f64eea 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-#	$NetBSD: files,v 1.124 1997/05/27 01:07:48 thorpej Exp $
+#	$NetBSD: files,v 1.125 1997/06/11 10:40:25 bouyer Exp $
 
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
 
@@ -424,13 +424,22 @@ file ufs/lfs/lfs_vfsops.c		lfs
 file ufs/lfs/lfs_vnops.c		lfs
 file ufs/mfs/mfs_vfsops.c		mfs
 file ufs/mfs/mfs_vnops.c		mfs
-file ufs/ufs/ufs_bmap.c			ffs | lfs | mfs
-file ufs/ufs/ufs_ihash.c		ffs | lfs | mfs
+file ufs/ufs/ufs_bmap.c			ffs | lfs | mfs | ext2fs
+file ufs/ufs/ufs_ihash.c		ffs | lfs | mfs | ext2fs
 file ufs/ufs/ufs_inode.c		ffs | lfs | mfs
-file ufs/ufs/ufs_lookup.c		ffs | lfs | mfs
+file ufs/ufs/ufs_lookup.c		ffs | lfs | mfs | ext2fs
 file ufs/ufs/ufs_quota.c		quota & (ffs | lfs | mfs)
-file ufs/ufs/ufs_vfsops.c		ffs | lfs | mfs
-file ufs/ufs/ufs_vnops.c		ffs | lfs | mfs
+file ufs/ufs/ufs_vfsops.c		ffs | lfs | mfs | ext2fs
+file ufs/ufs/ufs_vnops.c		ffs | lfs | mfs | ext2fs
+file ufs/ext2fs/ext2fs_alloc.c	ext2fs
+file ufs/ext2fs/ext2fs_balloc.c	ext2fs
+file ufs/ext2fs/ext2fs_bmap.c	ext2fs
+file ufs/ext2fs/ext2fs_inode.c	ext2fs
+file ufs/ext2fs/ext2fs_lookup.c	ext2fs
+file ufs/ext2fs/ext2fs_readwrite.c ext2fs
+file ufs/ext2fs/ext2fs_subr.c	ext2fs
+file ufs/ext2fs/ext2fs_vfsops.c	ext2fs
+file ufs/ext2fs/ext2fs_vnops.c	ext2fs
 file vm/device_pager.c			devpager
 file vm/kern_lock.c
 file vm/swap_pager.c			swappager
diff --git a/sys/kern/vfs_conf.c b/sys/kern/vfs_conf.c
index b4260c15a7e6..ed500206a7b6 100644
--- a/sys/kern/vfs_conf.c
+++ b/sys/kern/vfs_conf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vfs_conf.c,v 1.23 1997/01/31 02:36:24 thorpej Exp $	*/
+/*	$NetBSD: vfs_conf.c,v 1.24 1997/06/11 10:40:23 bouyer Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -109,6 +109,10 @@ extern	struct vfsops union_vfsops;
 extern 	struct vfsops adosfs_vfsops;
 #endif
 
+#ifdef EXT2FS
+extern struct vfsops ext2fs_vfsops;
+#endif
+
 /*
  * XXX ORDERING MATTERS, for COMPAT_09.  when that goes away, 
  * empty slots can go away.
@@ -191,6 +195,11 @@ struct vfsops *vfssw[] = {
 #else
 	NULL,
 #endif
+#ifdef EXT2FS
+	&ext2fs_vfsops,		 /* 17 = MOUNT_EXT2FS */
+#else
+	NULL,
+#endif
 #ifdef LKM			/* for LKM's.  add new FS's before these */
 	NULL,
 	NULL,
@@ -231,6 +240,9 @@ extern struct vnodeopv_desc cd9660_fifoop_opv_desc;
 extern struct vnodeopv_desc union_vnodeop_opv_desc;
 extern struct vnodeopv_desc msdosfs_vnodeop_opv_desc;
 extern struct vnodeopv_desc adosfs_vnodeop_opv_desc;
+extern struct vnodeopv_desc ext2fs_vnodeop_opv_desc;
+extern struct vnodeopv_desc ext2fs_specop_opv_desc;
+extern struct vnodeopv_desc ext2fs_fifoop_opv_desc;
 
 struct vnodeopv_desc *vfs_opv_descs[] = {
 #ifdef FFS
@@ -295,6 +307,13 @@ struct vnodeopv_desc *vfs_opv_descs[] = {
 #endif
 #ifdef ADOSFS
 	&adosfs_vnodeop_opv_desc,
+#endif
+#ifdef EXT2FS
+	&ext2fs_vnodeop_opv_desc,
+	&ext2fs_specop_opv_desc,
+#ifdef FIFO
+	&ext2fs_fifoop_opv_desc,
+#endif
 #endif
 	NULL
 };
diff --git a/sys/sys/malloc.h b/sys/sys/malloc.h
index b2bf1e7e9aaf..43decbbf27dd 100644
--- a/sys/sys/malloc.h
+++ b/sys/sys/malloc.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: malloc.h,v 1.29 1997/02/04 22:23:53 thorpej Exp $	*/
+/*	$NetBSD: malloc.h,v 1.30 1997/06/11 10:40:16 bouyer Exp $	*/
 
 /*
  * Copyright (c) 1987, 1993
@@ -126,6 +126,7 @@
 #define	M_NFSRVDESC	72	/* NFS server descriptor */
 #define	M_NFSDIROFF	73	/* NFS directory cookies */
 #define	M_NFSBIGFH	74	/* NFS big filehandle */
+#define M_EXT2FSNODE 75  /* EXT2FS vnode private part */
 #define	M_TEMP		84	/* misc temporary data buffers */
 #define	M_LAST		85	/* Must be last type + 1 */
 
@@ -205,7 +206,7 @@
 	"NFS srvdesc",	/* 72 M_NFSRVDESC */ \
 	"NFS diroff",	/* 73 M_NFSDIROFF */ \
 	"NFS bigfh",	/* 74 M_NFSBIGFH */ \
-	NULL, \
+	"EXT2FS node",  /* 75 M_EXT2FSNODE */ \
 	NULL, NULL, NULL, NULL, NULL, \
 	NULL, NULL, NULL, \
 	"temp",		/* 84 M_TEMP */ \
diff --git a/sys/sys/mount.h b/sys/sys/mount.h
index 83bfcdf9a15c..cd2ca1c5b70e 100644
--- a/sys/sys/mount.h
+++ b/sys/sys/mount.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: mount.h,v 1.56 1997/03/23 20:54:06 fvdl Exp $	*/
+/*	$NetBSD: mount.h,v 1.57 1997/06/11 10:40:18 bouyer Exp $	*/
 
 /*
  * Copyright (c) 1989, 1991, 1993
@@ -101,6 +101,7 @@ struct statfs {
 #define	MOUNT_CD9660	"cd9660"	/* ISO9660 (aka CDROM) Filesystem */
 #define	MOUNT_UNION	"union"		/* Union (translucent) Filesystem */
 #define	MOUNT_ADOSFS	"adosfs"	/* AmigaDOS Filesystem */
+#define MOUNT_EXT2FS   "ext2fs"		/* Second Extended Filesystem */
 
 /*
  * Structure per mounted file system.  Each mounted file system has an
diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h
index 0dba2278b0fe..300a0d8b7d37 100644
--- a/sys/sys/vnode.h
+++ b/sys/sys/vnode.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: vnode.h,v 1.42 1997/05/08 16:20:41 mycroft Exp $	*/
+/*	$NetBSD: vnode.h,v 1.43 1997/06/11 10:40:19 bouyer Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -59,7 +59,7 @@ enum vtype	{ VNON, VREG, VDIR, VBLK, VCHR, VLNK, VSOCK, VFIFO, VBAD };
 enum vtagtype	{
 	VT_NON, VT_UFS, VT_NFS, VT_MFS, VT_MSDOSFS, VT_LFS, VT_LOFS, VT_FDESC,
 	VT_PORTAL, VT_NULL, VT_UMAP, VT_KERNFS, VT_PROCFS, VT_AFS, VT_ISOFS,
-	VT_UNION, VT_ADOSFS
+	VT_UNION, VT_ADOSFS, VT_EXT2FS
 };
 
 /*