diff --git a/ocaml.spec b/ocaml.spec
index 312839c..dcef59f 100644
--- a/ocaml.spec
+++ b/ocaml.spec
@@ -3,9 +3,6 @@
 # architectures.  A further subset of architectures support native
 # dynamic linking.
 
-%global ocaml_native_compiler aarch64 %{arm} %{ix86} ppc ppc64 ppc64le sparc sparcv9 x86_64
-%global ocaml_natdynlink      aarch64 %{arm} %{ix86} ppc ppc64 ppc64le sparc sparcv9 x86_64
-
 %ifarch %{ocaml_native_compiler}
 %global native_compiler 1
 %else
@@ -20,7 +17,7 @@
 
 Name:           ocaml
 Version:        4.01.0
-Release:        15%{?dist}
+Release:        16%{?dist}
 
 Summary:        OCaml compiler and programming environment
 
@@ -66,6 +63,9 @@ Patch0012:      0012-arg-Allow-flags-such-as-flag-arg-as-well-as-flag-arg.patch
 # ppc64le support (Michel Normand).
 Patch0013:      0013-Add-support-for-ppc64le.patch
 
+# Temporary, we can drop this explicit BR in June 2014:
+BuildRequires:  ocaml-srpm-macros
+
 BuildRequires:  ncurses-devel
 BuildRequires:  gdbm-devel
 BuildRequires:  tcl-devel
@@ -240,15 +240,6 @@ Note that this exposes internal details of the OCaml compiler which
 may not be portable between versions.
 
 
-%package srpm-macros
-Summary:        %{name} SRPM macros
-
-
-%description srpm-macros
-This package contains macros needed by RPM in order to build
-SRPMS.  It does not pull in any other OCaml dependencies.
-
-
 %prep
 %setup -q -T -b 0 -n %{name}-%{version}
 %setup -q -T -D -a 1 -n %{name}-%{version}
@@ -340,21 +331,6 @@ install -m 0755 ocamlbyteinfo $RPM_BUILD_ROOT%{_bindir}
 
 find $RPM_BUILD_ROOT -name .ignore -delete
 
-# Create RPM macros file (RHBZ#1087794).
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm
-cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.ocaml-srpm
-# Note that OCaml is compiled on all architectures.  However
-# on some (rare) architectures, only bytecode compilation is
-# available.  Use these macros to find out if native code
-# compilation is available on a particular architecture.
-
-# Architectures that support the OCaml native code compiler.
-%%ocaml_native_compiler %{ocaml_native_compiler}
-
-# Architectures that support native dynamic linking of OCaml code.
-%%ocaml_natdynlink      %{ocaml_natdynlink}
-EOF
-
 
 %post docs
 /sbin/install-info \
@@ -569,11 +545,11 @@ fi
 %endif
 
 
-%files srpm-macros
-%{_sysconfdir}/rpm/macros.ocaml-srpm
-
-
 %changelog
+* Tue Apr 22 2014 Richard W.M. Jones <rjones@redhat.com> - 4.01.0-16
+- Remove ocaml-srpm-macros subpackage.
+  This is now a separate package, see RHBZ#1087893.
+
 * Tue Apr 15 2014 Richard W.M. Jones <rjones@redhat.com> - 4.01.0-15
 - Fix s390x builds (no native compiler).