diff --git a/.cvsignore b/.cvsignore
index dd602b5..7f92ccc 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-xfsprogs_2.9.4-1.tar.gz
+xfsprogs_2.9.5-1.tar.gz
diff --git a/sources b/sources
index 0a4dd33..c8e55e7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-174683e3b86b587ed59823fdbbb96ea4  xfsprogs_2.9.4-1.tar.gz
+d9079d9a8dbc7cc983ed518842ca909f  xfsprogs_2.9.5-1.tar.gz
diff --git a/xfsprogs-2.9.4-misc-mkfs-fixes.patch b/xfsprogs-2.9.4-misc-mkfs-fixes.patch
deleted file mode 100644
index 4327662..0000000
--- a/xfsprogs-2.9.4-misc-mkfs-fixes.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-To: sgi.bugs.xfs@engr.sgi.com
-Cc: xfs@oss.sgi.com
-Subject: TAKE 970978 - Fix a couple mkfs.xfs issues
-Date: Tue, 25 Sep 2007 13:52:54 +1000 (EST)
-From: bnaujok@sgi.com (Barry Naujok)
-
-Fix wiping old AG headers and purge whack buffers
-
-
-Date:  Tue Sep 25 13:52:20 AEST 2007
-Workarea:  chook.melbourne.sgi.com:/home/bnaujok/isms/xfs-cmds
-Inspected by:  sandeen@sandeen.net
-
-The following file(s) were checked into:
-  longdrop.melbourne.sgi.com:/isms/xfs-cmds/master-melb
-
-
-Modid:  master-melb:xfs-cmds:29767a
-xfsprogs/mkfs/xfs_mkfs.c - 1.82 - changed
-http://oss.sgi.com/cgi-bin/cvsweb.cgi/xfs-cmds/xfsprogs/mkfs/xfs_mkfs.c.diff?r1=text&tr1=1.82&r2=text&tr2=1.81&f=h
-	- Fix wiping old AG headers and purge whack buffers
-
---- xfsprogs/mkfs/xfs_mkfs.c	2007/07/16 03:56:15	1.81
-+++ xfsprogs/mkfs/xfs_mkfs.c	2007/09/25 06:15:37	1.82
-@@ -558,15 +558,12 @@ zero_old_xfs_structures(
- 		goto done;
- 
- 	/*
--	 * block size and basic geometry seems alright, zero the secondaries,
--	 * but don't go beyond the end of the new filesystem.
-+	 * block size and basic geometry seems alright, zero the secondaries.
- 	 */
- 	bzero(buf, new_sb->sb_sectsize);
- 	off = 0;
- 	for (i = 1; i < sb.sb_agcount; i++)  {
- 		off += sb.sb_agblocks;
--		if (off >= new_sb->sb_dblocks)
--			break;
- 		if (pwrite64(xi->dfd, buf, new_sb->sb_sectsize,
- 					off << sb.sb_blocklog) == -1)
- 			break;
-@@ -2115,6 +2112,7 @@ an AG size that is one stripe unit small
- 				    BTOBB(WHACK_SIZE));
- 		bzero(XFS_BUF_PTR(buf), WHACK_SIZE);
- 		libxfs_writebuf(buf, LIBXFS_EXIT_ON_FAILURE);
-+		libxfs_purgebuf(buf);
- 	}
- 
- 	/*
-
diff --git a/xfsprogs.spec b/xfsprogs.spec
index 621d79a..a9d4462 100644
--- a/xfsprogs.spec
+++ b/xfsprogs.spec
@@ -1,25 +1,23 @@
-Summary: Utilities for managing the XFS filesystem
-Name: xfsprogs
-Version: 2.9.4
-Release: 4%{?dist}
+Summary:	Utilities for managing the XFS filesystem
+Name:		xfsprogs
+Version:	2.9.5
+Release:	1%{?dist}
 # Licensing based on generic "GNU GENERAL PUBLIC LICENSE"
 # in source, with no mention of version.
 # doc/COPYING file specifies what is GPL and what is LGPL
 # but no mention of versions in the source.
-License: GPL+ and LGPLv2+
-Group: System Environment/Base
-URL: http://oss.sgi.com/projects/xfs/
-Source0: ftp://oss.sgi.com/projects/xfs/download/cmd_tars/%{name}_%{version}-1.tar.gz
-Source1: xfsprogs-wrapper.h
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: autoconf, libtool, gettext, gawk
-BuildRequires: readline-devel
-BuildRequires: /usr/include/uuid/uuid.h
-Provides: xfs-cmds
-Obsoletes: xfs-cmds <= %{version}
-Conflicts: xfsdump < 2.0.0
-
-Patch1: xfsprogs-2.9.4-misc-mkfs-fixes.patch
+License:	GPL+ and LGPLv2+
+Group:		System Environment/Base
+URL:		http://oss.sgi.com/projects/xfs/
+Source0:	ftp://oss.sgi.com/projects/xfs/download/cmd_tars/%{name}_%{version}-1.tar.gz
+Source1:	xfsprogs-wrapper.h
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	autoconf, libtool, gettext, gawk
+BuildRequires:	readline-devel
+BuildRequires:	/usr/include/uuid/uuid.h
+Provides:	xfs-cmds
+Obsoletes:	xfs-cmds <= %{version}
+Conflicts:	xfsdump < 2.0.0
 
 %description
 A set of commands to use the XFS filesystem, including mkfs.xfs.
@@ -50,28 +48,23 @@ also want to install xfsprogs.
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
-# xfsprogs does not ship ./configure
-autoconf
-#
 # xfsprogs abuses libexecdir
 export tagname=CC DEBUG=-DNDEBUG
+
 %configure \
         --sbindir=/sbin         \
         --libdir=/%{_lib}       \
         --libexecdir=%{_libdir} \
-        --bindir=%{_sbindir}    \
-        --enable-shared=yes     \
-        --enable-gettext=yes    \
-        --enable-shared-uuid=yes
+        --bindir=%{_sbindir}
+
 make %{?_smp_mflags}
-#
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make DIST_ROOT=$RPM_BUILD_ROOT install install-dev
-#
+
 # nuke .la files, etc
 rm -f $RPM_BUILD_ROOT/{%{_lib}/*.{la,a,so},%{_libdir}/*.la}
 # fix up symlink to be correct
@@ -114,6 +107,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 
 %changelog
+* Mon Jan 21 2008 Eric Sandeen <sandeen@redhat.com> 2.9.5-1
+- Update to xfsprogs 2.9.5
+- Contains more optimal mkfs defaults
+- specfile cleanup, & don't restate config defaults
+
 * Tue Oct 23 2007 Eric Sandeen <sandeen@redhat.com> 2.9.4-4
 - Add arm to multilib header wrapper