diff --git a/.gitignore b/.gitignore
index 9526550..bf834c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/gambc-v*-devel.tgz
+/gambit-v*-devel.tgz
diff --git a/gambit-c.spec b/gambit-c.spec
index 75dc64b..01e3244 100644
--- a/gambit-c.spec
+++ b/gambit-c.spec
@@ -1,4 +1,4 @@
-%global _dirname gambc-v4_7_9-devel
+%global _dirname gambit-v4_8_4-devel
 
 # Using -O2 on ppc64 triggers ICE with gcc < 4.6.4
 # http://www.iro.umontreal.ca/~gambit/bugzilla/show_bug.cgi?id=155
@@ -16,14 +16,14 @@
 %endif # el6
 
 Name:           gambit-c
-Version:        4.7.9
-Release:        2%{?dist}
+Version:        4.8.4
+Release:        1%{?dist}
 Summary:        Scheme programming system
 
 Group:          Development/Languages
 License:        ASL 2.0 or LGPLv2
 URL:            http://gambitscheme.org/
-Source0:        http://www.iro.umontreal.ca/~gambit/download/gambit/v4.7/source/%{_dirname}.tgz
+Source0:        http://www.iro.umontreal.ca/~gambit/download/gambit/v4.8/source/%{_dirname}.tgz
 Source1:        gambit-init.el
 Patch0:         gambc-v4_2_8-modtime.patch
 
@@ -33,6 +33,11 @@ Requires:       emacs-filesystem >= %{_emacs_version}
 Obsoletes:      emacs-gambit    < 4.7.7-2
 Obsoletes:      emacs-gambit-el < 4.7.7-2
 
+# number->string issue; disabling until we know more
+# https://github.com/feeley/gambit/issues/181
+# https://bugzilla.redhat.com/show_bug.cgi?id=1310438
+ExcludeArch:    armv7hl
+
 %description
 Gambit-C includes a Scheme interpreter and a Scheme compiler which can
 be used to build standalone executables.  Because the compiler
@@ -66,13 +71,12 @@ This package contains the Gambit-C user manual in HTML and PDF formats.
 
 
 %prep
-%setup -q -n %{_dirname}
-%patch0 -p1 -b .modtime
+%autosetup -n %{_dirname} -p1
 
-touch -r doc/gambit-c.info-2{,.tstamp}
-iconv -f iso88591 -t utf8 doc/gambit-c.info-2 -o doc/gambit-c.info-2.utf8
-touch -r doc/gambit-c.info-2{,.utf8}
-mv doc/gambit-c.info-2{.utf8,}
+#touch -r doc/gambit-c.info-2{,.tstamp}
+#iconv -f iso88591 -t utf8 doc/gambit-c.info-2 -o doc/gambit-c.info-2.utf8
+#touch -r doc/gambit-c.info-2{,.utf8}
+#mv doc/gambit-c.info-2{.utf8,}
 # Permission fixes
 chmod -x lib/*.{c,h}
 
@@ -168,7 +172,7 @@ fi
 
 %files doc
 %defattr(-,root,root,-)
-%doc doc/gambit-c.html doc/gambit-c.pdf
+%doc doc/gambit.html doc/gambit.pdf
 # don't package examples until makefiles are fixed
 # examples
 %{_infodir}/*
@@ -176,6 +180,9 @@ fi
 
 
 %changelog
+* Sun Feb 21 2016 Michel Alexandre Salim <salimma@fedoraproject.org> - 4.8.4-1
+- Update to 4.8.4
+
 * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 4.7.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
diff --git a/sources b/sources
index abff776..27f67f7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-18191b5707db0e761822ecb0245c5ca6  gambc-v4_7_9-devel.tgz
+bd045e9fb2b95258e0a1f4bc4160c5fc  gambit-v4_8_4-devel.tgz