diff --git a/ocaml.spec b/ocaml.spec
index 2030e4b..5bc639b 100644
--- a/ocaml.spec
+++ b/ocaml.spec
@@ -70,7 +70,9 @@ Patch0007:      0007-Try-fix-for-andi-ori-xori-immediates-1.patch
 BuildRequires:  binutils-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  gdbm-devel
+%ifnarch riscv64
 BuildRequires:  emacs
+%endif
 BuildRequires:  gawk
 BuildRequires:  perl
 BuildRequires:  util-linux
@@ -152,6 +154,7 @@ Provides:	ocamldoc
 Documentation generator for OCaml.
 
 
+%ifnarch riscv64
 %package emacs
 Summary:        Emacs mode for OCaml
 Requires:       ocaml = %{version}-%{release}
@@ -159,6 +162,7 @@ Requires:       emacs(bin)
 
 %description emacs
 Emacs mode for OCaml.
+%endif
 
 
 %package docs
@@ -220,7 +224,9 @@ $make world
 $make opt
 $make opt.opt
 %endif
+%ifnarch riscv64
 make -C emacs ocamltags
+%endif
 
 # Currently these tools are supplied by Debian, but are expected
 # to go upstream at some point.
@@ -251,6 +257,7 @@ make install \
      MANDIR=$RPM_BUILD_ROOT%{_mandir}
 perl -pi -e "s|^$RPM_BUILD_ROOT||" $RPM_BUILD_ROOT%{_libdir}/ocaml/ld.conf
 
+%ifnarch riscv64
 (
     # install emacs files
     cd emacs;
@@ -259,6 +266,7 @@ perl -pi -e "s|^$RPM_BUILD_ROOT||" $RPM_BUILD_ROOT%{_libdir}/ocaml/ld.conf
          EMACSDIR=$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
     make install-ocamltags BINDIR=$RPM_BUILD_ROOT%{_bindir}
 )
+%endif
 
 (
     # install info files
@@ -421,10 +429,12 @@ fi
 %{_mandir}/man3/*
 
 
+%ifnarch riscv64
 %files emacs
 %doc emacs/README
 %{_datadir}/emacs/site-lisp/*
 %{_bindir}/ocamltags
+%endif
 
 
 %files compiler-libs
@@ -445,6 +455,7 @@ fi
 * Fri Nov 11 2016 Richard W.M. Jones <rjones@redhat.com> - 4.04.0-4
 - riscv64: Fix intermediate operands.
   (https://github.com/nojb/riscv-ocaml/issues/1)
+- Temporarily disable emacs subpackage on riscv64.
 
 * Wed Nov 09 2016 Richard W.M. Jones <rjones@redhat.com> - 4.04.0-3
 - s390x: Fix address of caml_raise_exn in native dynlink modules.