diff --git a/sharutils.spec b/sharutils.spec
index fbb8ddb..0ab1fe3 100644
--- a/sharutils.spec
+++ b/sharutils.spec
@@ -1,14 +1,15 @@
-Summary: The GNU shar utilities for packaging and unpackaging shell archives.
+Summary: The GNU shar utilities for packaging and unpackaging shell archives
 Name: sharutils
-Version: 4.6.3
-Release: 2%{?dist}
-License: GPL
+Version: 4.7
+Release: 1%{?dist}
+License: GPLv3+
 Group: Applications/Archiving
 Source: ftp://ftp.gnu.org/gnu/sharutils/REL-%{version}/sharutils-%{version}.tar.bz2
 URL: http://www.gnu.org/software/sharutils/
 BuildRequires: gettext
-Prereq: /sbin/install-info
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Requires(pre): info
+Requires(preun): info
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 The sharutils package contains the GNU shar utilities, a set of tools
@@ -23,44 +24,55 @@ scans mail messages looking for shar files.  Unshar automatically
 strips off mail headers and introductory text and then unpacks the
 shar files.
 
-Install sharutils if you send binary files through e-mail.
-
 %prep
 %setup -q
 
+# convert TODO, THANKS to UTF-8
+for i in TODO THANKS; do
+  iconv -f iso-8859-1 -t utf-8 -o $i{.utf8,}
+  mv $i{.utf8,}
+done
+
 %build
 %configure
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-
-%makeinstall
+make DESTDIR=${RPM_BUILD_ROOT} INSTALL='install -p' install
 rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
-mkdir -p ${RPM_BUILD_ROOT}%{_docdir}-%{name}-%{version}
 chmod 644 AUTHORS ChangeLog COPYING NEWS README THANKS TODO
 
+%check
+make check
+
 %find_lang %{name}
 
 %post
-/sbin/install-info %{_infodir}/sharutils.info.gz %{_infodir}/dir ||:
+/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir ||:
 
 %preun
 if [ $1 = 0 ]; then
-    /sbin/install-info --delete %{_infodir}/sharutils.info.gz %{_infodir}/dir ||:
+    /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir ||:
 fi
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
 %files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README THANKS TODO
 %{_bindir}/*
 %{_infodir}/*info*
-%{_mandir}/*/*
+%{_mandir}/man1/*
+%{_mandir}/man5/*
 
 %changelog
+* Thu Sep  4 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 4.7-1
+- update to 4.7
+- fix license tag
+- package cleanups
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 4.6.3-2
 - Autorebuild for GCC 4.3
 
@@ -158,7 +170,7 @@ rm -rf ${RPM_BUILD_ROOT}
 - rebuilt in the new build environment
 
 * Thu Jun 08 2000 Than Ngo <than@redhat.de>
-- add %defattr(-,root,root) (Bug# 11990)
+- add %%defattr(-,root,root) (Bug# 11990)
 - use rpm macros
 
 * Sun May 21 2000 Ngo Than <than@redhat.de>