diff --git a/fs/xfs/Makefile b/fs/xfs/Makefile
index 726cfaa..70082c7 100644
--- a/fs/xfs/Makefile
+++ b/fs/xfs/Makefile
@@ -36,10 +36,9 @@ subdir-ccflags-$(CONFIG_XFS_DEBUG) += -g
 # that xfs.ko module actually requires. The lack of an "--end-group" varaible
 # means LD considers all object files on the command line for recursive object
 # searching and hence solves the specification order problem.
-ldflags-y += --start-group $(obj)/libxfs/lib.a
+#ldflags-y += --start-group $(obj)/libxfs/lib.a
 
-obj-$(CONFIG_XFS_FS)		+= libxfs/ \
-				   xfs.o
+obj-$(CONFIG_XFS_FS)		+= xfs.o
 
 # this one should be compiled first, as the tracing macros can easily blow up
 xfs-y				+= xfs_trace.o
@@ -105,3 +104,32 @@ xfs-$(CONFIG_XFS_POSIX_ACL)	+= xfs_acl.o
 xfs-$(CONFIG_PROC_FS)		+= xfs_stats.o
 xfs-$(CONFIG_SYSCTL)		+= xfs_sysctl.o
 xfs-$(CONFIG_COMPAT)		+= xfs_ioctl32.o
+
+# libxfs
+xfs-y			+= libxfs/xfs_alloc.o \
+			   libxfs/xfs_alloc_btree.o \
+			   libxfs/xfs_attr.o \
+			   libxfs/xfs_attr_leaf.o \
+			   libxfs/xfs_attr_remote.o \
+			   libxfs/xfs_bmap.o \
+			   libxfs/xfs_bmap_btree.o \
+			   libxfs/xfs_btree.o \
+			   libxfs/xfs_da_btree.o \
+			   libxfs/xfs_da_format.o \
+			   libxfs/xfs_dir2.o \
+			   libxfs/xfs_dir2_block.o \
+			   libxfs/xfs_dir2_data.o \
+			   libxfs/xfs_dir2_leaf.o \
+			   libxfs/xfs_dir2_node.o \
+			   libxfs/xfs_dir2_sf.o \
+			   libxfs/xfs_dquot_buf.o \
+			   libxfs/xfs_ialloc.o \
+			   libxfs/xfs_ialloc_btree.o \
+			   libxfs/xfs_inode_fork.o \
+			   libxfs/xfs_inode_buf.o \
+			   libxfs/xfs_log_rlimit.o \
+			   libxfs/xfs_sb.o \
+			   libxfs/xfs_symlink_remote.o \
+			   libxfs/xfs_trans_resv.o
+
+xfs-$(CONFIG_XFS_RT)	+= libxfs/xfs_rtbitmap.o