diff --git a/xfsprogs.changes b/xfsprogs.changes
index 482d072..be46753 100644
--- a/xfsprogs.changes
+++ b/xfsprogs.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Feb  6 22:33:58 UTC 2012 - rschweikert@suse.com
+
+- use %configure
+
+-------------------------------------------------------------------
+Fri Feb  3 14:50:27 UTC 2012 - rschweikert@suse.com
+
+- move libs and executables to /usr tree (UsrMerge project)
+
 -------------------------------------------------------------------
 Fri Oct 14 17:15:56 CEST 2011 - dsterba@suse.cz
 
diff --git a/xfsprogs.spec b/xfsprogs.spec
index aa32c3b..0415ed9 100644
--- a/xfsprogs.spec
+++ b/xfsprogs.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package xfsprogs
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,22 +15,18 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
-
 Name:           xfsprogs
 BuildRequires:  e2fsprogs-devel
 Version:        3.1.6
-Release:        1
+Release:        0
 %if 0%{?suse_version} >= 1010
 # hint for ZYPP
 Supplements:    filesystem(xfs)
 %endif
-AutoReqProv:    on
-Group:          System/Filesystems
-License:        GPL-2.0+
 Url:            http://oss.sgi.com/projects/xfs/
 Summary:        Utilities for managing the XFS file system
+License:        GPL-2.0+
+Group:          System/Filesystems
 Source0:        xfsprogs-%{version}.tar.gz
 Patch0:         xfsprogs-docdir.diff
 Patch1:         xfsprogs-ppc64.diff
@@ -58,11 +54,9 @@ Authors:
 
 %package      devel
 Requires:       xfsprogs = %version
-AutoReqProv:    on
-Group:          Development/Libraries/C and C++
-License:        GPL-2.0+
 Url:            http://oss.sgi.com/projects/xfs/
 Summary:        XFS Filesystem-specific Static Libraries and Headers
+Group:          Development/Libraries/C and C++
 
 %description devel
 xfsprogs-devel contains the libraries and header files needed to
@@ -88,13 +82,7 @@ export OPTIMIZER="-fPIC"
 export DEBUG=-DNDEBUG
 export LIBUUID=/usr/%{_lib}/libuuid.a
 export CFLAGS="$RPM_OPT_FLAGS"
-./configure \
-	--prefix=%{_prefix} \
-	--libdir=/%{_libdir} \
-	--libexecdir=/usr/%{_lib} \
-	--includedir=%{_includedir} \
-	--mandir=%{_mandir} \
-	--datadir=%{_datadir}
+%configure --sbindir=%{_sbindir} --mandir=%{_mandir} --datadir=%{_datadir}
 make %{?jobs:-j %jobs}
 
 %install
@@ -104,11 +92,18 @@ export DIST_ROOT="$RPM_BUILD_ROOT"
 # remove devel stuff from /lib
 rm $RPM_BUILD_ROOT/%_lib/libhandle.{so,a,la}
 rm $RPM_BUILD_ROOT/%_libdir/libhandle.so
+# move things to usr
+mv $RPM_BUILD_ROOT/sbin/* $RPM_BUILD_ROOT%{_sbindir}
+mv $RPM_BUILD_ROOT/%_lib/* $RPM_BUILD_ROOT%{_libdir}
+#UsrMerge
+ln -sf %{_sbindir}/{fsck.xfs,mkfs.xfs,xfs_repair} $RPM_BUILD_ROOT/sbin
+ln -sf %{_libdir}/libhandle.so.1 $RPM_BUILD_ROOT/%{_lib}
+ln -sf %{_libdir}/libhandle.so.1.0.3 $RPM_BUILD_ROOT/%{_lib}
+#EndUserMerge
 pushd $RPM_BUILD_ROOT%_libdir
-	ls ../../%_lib/libhandle.so.[0-9]
-	ln -s ../../%_lib/libhandle.so.[0-9] libhandle.so
+	ln -s libhandle.so.[0-9] libhandle.so
 popd
-chmod 755 $RPM_BUILD_ROOT/sbin/fsck.xfs
+chmod 755 $RPM_BUILD_ROOT/%_sbindir/fsck.xfs
 %find_lang %name
 
 %clean
@@ -120,16 +115,19 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %name.lang
 %defattr(-,root,root,755)
+#UsrMerge
 /sbin/*
-/usr/sbin/*
-# this is only used by xfs cmds, therefore no urgent need for a shlib package
 /%_lib/libhandle.so.*
+#EndUsrMerge
+%_sbindir/*
+# this is only used by xfs cmds, therefore no urgent need for a shlib package
+%_libdir/libhandle.so.*
 %doc /usr/share/man/man[58]/*
 %doc %_defaultdocdir/%name
 
 %files devel
 %defattr(-,root,root,755)
-/usr/include/xfs
+%_includedir/xfs
 %_libdir/*.so
 %_libdir/*.a
 %_libdir/*.la