diff --git a/ORBit.spec b/ORBit.spec
index 1427921..c8f7617 100644
--- a/ORBit.spec
+++ b/ORBit.spec
@@ -1,7 +1,7 @@
 Summary:		CORBA Object Request Broker for GNOME-1 compatibility
 Name:			ORBit
 Version:		0.5.17
-Release:		31%{?dist}
+Release:		32%{?dist}
 Epoch:			1
 URL:			http://orbit-resource.sourceforge.net/
 Source:			http://ftp.acc.umu.se/pub/gnome/sources/ORBit/0.5/ORBit-0.5.17.tar.bz2 
@@ -13,7 +13,7 @@ Patch4:			ORBit-0.5.17-non-weak-symbols.patch
 Patch5:			ORBit-0.5.17-make-3.82.patch
 Group:			System Environment/Daemons
 License:		LGPLv2+ and GPLv2+
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
 BuildRequires:		flex, gettext, glib-devel, /usr/include/tcpd.h, pkgconfig, libtool
 
 # Test code in built-in popt library is built statically.
@@ -72,22 +72,25 @@ with GNOME-1 applications.
 %configure
 
 # Kill bogus RPATHs
-%{__sed} -i 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir}|' libtool
+sed -i 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir}|' libtool
 
 # %{?_smp_mflags} removed at release 1:0.5.17-10.2
-%{__make}
+make
 
 %install
-%{__rm} -rf %{buildroot}
-%{__make} DESTDIR=%{buildroot} INSTALL="%{__install} -p" install
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} INSTALL="install -p" install
 
 # remove unpackaged files
-%{__rm} -f %{buildroot}%{_bindir}/ior-decode
-%{__rm} -f %{buildroot}%{_bindir}/old-name-server
-%{__rm} -f %{buildroot}%{_libdir}/*.la
-%{__rm} -f %{buildroot}%{_libdir}/lib{IDL,IIOP,ORBit,ORBitCosNaming,ORBitutil}.a
-%{__rm} -f %{buildroot}%{_datadir}/idl/orbit-1.0/*
-%{__rm} -f %{buildroot}%{_datadir}/info/dir
+rm -f %{buildroot}%{_bindir}/ior-decode
+rm -f %{buildroot}%{_bindir}/old-name-server
+rm -f %{buildroot}%{_libdir}/*.la
+rm -f %{buildroot}%{_libdir}/lib{IDL,IIOP,ORBit,ORBitCosNaming,ORBitutil}.a
+rm -f %{buildroot}%{_datadir}/idl/orbit-1.0/*
+rm -f %{buildroot}%{_datadir}/info/dir
+
+%clean
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
@@ -99,9 +102,6 @@ with GNOME-1 applications.
 %preun devel
 [ $1 = 0 ] && /sbin/install-info --delete %{_infodir}/libIDL.info.gz %{_infodir}/dir || :
 
-%clean
-%{__rm} -rf %{buildroot}
-
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README TODO
@@ -143,6 +143,9 @@ with GNOME-1 applications.
 %{_datadir}/aclocal/libIDL.m4
 
 %changelog
+* Fri Jan  6 2012 Paul Howarth <paul@city-fan.org> - 1:0.5.17-32
+- Nobody else likes macros for commands
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.5.17-31
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild