diff --git a/dmidecode.spec b/dmidecode.spec
index d7666b8..e096412 100644
--- a/dmidecode.spec
+++ b/dmidecode.spec
@@ -1,50 +1,54 @@
 Summary:        Tool to analyse BIOS DMI data.
 Name:           dmidecode
 Version:        2.7
-Release: 	%(R="$Revision: 1.17 $"; RR="${R##: }"; echo ${RR%%?})
+Release: 	%(R="$Revision: 1.18 $"; RR="${R##: }"; echo ${RR%%?})
 Epoch:		1
 Group:          System Environment/Base
 License:        GPL
 Source0:	dmidecode-%{version}.tar.bz2
+URL:		http://www.nongnu.org/dmidecode/
 Buildroot:      %{_tmppath}/%{name}-%{version}-root
 BuildPreReq: 	/usr/bin/aclocal /usr/bin/automake /usr/bin/autoconf
 ExclusiveArch:	i386 x86_64
 Obsoletes:	kernel-utils
 
 %description
-dmidecode decodes the DMI data present in x86 and IA64 BIOS's.
+dmidecode reports information about x86 hardware as described in the
+system BIOS according to the SMBIOS/DMI standard. This information
+typically includes system manufacturer, model name, serial number,
+BIOS version, asset tag as well as a lot of other details of varying
+level of interest and reliability depending on the manufacturer.
+
+This will often include usage status for the CPU sockets, expansion
+slots (e.g. AGP, PCI, ISA) and memory module slots, and the list of
+I/O ports (e.g. serial, parallel, USB).
 
 %prep
-%setup -q -c -a 0
+%setup -q
 
 %build
-rm -rf $RPM_BUILD_ROOT
-mkdir -p %{buildroot}/usr/sbin
-cd dmidecode-%{version}
 make CFLAGS="$RPM_OPT_FLAGS"
-cd ..
 
 %install
-cd dmidecode-%{version}
-install dmidecode %{buildroot}/usr/sbin
-install vpddecode %{buildroot}/usr/sbin
-%ifarch %{ix86}
-install ownership %{buildroot}/usr/sbin 
-%endif
-
-chmod -R a-s %{buildroot}
+rm -rf $RPM_BUILD_ROOT
+make DESTDIR=%{buildroot} prefix=%{_prefix} install-bin install-man
+
 %clean
-[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT;
+rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-/usr/sbin/dmidecode
-/usr/sbin/vpddecode
-%ifarch %{ix86}
-/usr/sbin/ownership
-%endif
+%doc AUTHORS CHANGELOG LICENSE README
+%{_sbindir}/dmidecode
+%{_sbindir}/vpddecode
+%{_sbindir}/ownership
+%{_sbindir}/biosdecode
+%{_mandir}/man8/*
 
 %changelog
+* Mon Nov 28 2005 Dave Jones <davej@redhat.com>
+- Integrate several specfile cleanups from Robert Scheck. (#172543)
+
 * Sat Sep 24 2005 Dave Jones <davej@redhat.com>
 - Revert yesterdays patch, its unneeded in 2.7