diff --git a/jfsutils.spec b/jfsutils.spec
index c636546..68addfb 100644
--- a/jfsutils.spec
+++ b/jfsutils.spec
@@ -1,12 +1,12 @@
-Summary: Utilities for managing the JFS filesystem.
+Summary: Utilities for managing the JFS filesystem
 Name: jfsutils
 Version: 1.1.13
-Release: 2
+Release: 3%{?dist}
 Source0: jfsutils-%{version}.tar.gz
 URL: http://jfs.sourceforge.net/
 Group: System Environment/Base
 License: GPLv2+
-Buildroot: %{_tmppath}/%{name}-root
+Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Buildrequires: e2fsprogs-devel
 
 %description
@@ -23,19 +23,18 @@ into a file;  xpeek - shell-type JFS file system editor.
 
 %prep
 %setup -q
+find . -type f -name *.[ch] -exec chmod -x {} \;
 
 %build
-CFLAGS="${RPM_OPT_FLAGS}" ./configure --mandir=%{_mandir}
-make
+CFLAGS="${RPM_OPT_FLAGS}" ./configure --sbindir=%{_sbindir} --mandir=%{_mandir} --libdir=%{_libdir}
+make %{?_smp_mflags}
 
 %install
-[ "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-# let brp-compress handle this policy
-rm -f $RPM_BUILD_ROOT/%{_mandir}/*/*.gz
 
 %clean
-[ "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
@@ -44,6 +43,9 @@ rm -f $RPM_BUILD_ROOT/%{_mandir}/*/*.gz
 %doc AUTHORS COPYING INSTALL NEWS README ChangeLog
 
 %changelog
+* Mon Mar 23 2009 Josh Boyer <jwboyer@gmail.com> - 1.1.13-3
+- Fix merge review issues (bug 225945)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.13-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild