diff --git a/ORBit2.spec b/ORBit2.spec
index 89dfca5..6c75e83 100644
--- a/ORBit2.spec
+++ b/ORBit2.spec
@@ -4,7 +4,7 @@
 Summary: A high-performance CORBA Object Request Broker
 Name: ORBit2
 Version: 2.14.12
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source: http://download.gnome.org/sources/ORBit2/2.14/%{name}-%{version}.tar.bz2
 Group: System Environment/Daemons
 License: LGPLv2 and GPLv2
@@ -37,10 +37,9 @@ write programs that use CORBA technology.
 %package devel
 Summary: Development libraries, header files and utilities for ORBit
 Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
 Requires: indent
-Requires: glib2-devel
 Requires: libIDL-devel >= %{libidl_version}
-Requires: %{name} = %{version}-%{release}
 Requires: glib2-devel >= %{glib2_version}
 # we install a pc file
 Requires: pkgconfig
@@ -73,8 +72,8 @@ autoconf
 make
 
 %install
-rm -rf %{buildroot}
-%makeinstall
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/ORBit-2.0/*.*a
@@ -110,19 +109,20 @@ EOF
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
+
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
-%doc AUTHORS COPYING NEWS README TODO
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING README TODO
 %{_libdir}/*.so.*
+%dir %{_libdir}/orbit-2.0
 %{_libdir}/orbit-2.0/*.so*
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_libdir}/*.so
-%{_libdir}/orbit-2.0
 # this is needed by libbonobo
 %{_libdir}/libname-server-2.a
 %{_libdir}/pkgconfig/*
@@ -132,11 +132,15 @@ rm -rf %{buildroot}
 %{_bindir}/ior-decode-2
 %{_includedir}/*
 %{_datadir}/aclocal/*
+%dir %{_datadir}/idl
 %{_datadir}/idl/orbit-2.0
 %{_bindir}/linc-cleanup-sockets
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Sat Mar 15 2008 Matthias Clasen <mclasen@redhat.com> - 2.14.12-3
+- Fix some packaging trivia
+
 * Fri Feb  8 2008 Matthias Clasen <mclasen@redhat.com> - 2.14.12-2
 - Rebuild for gcc 4.3