diff --git a/0004-Don-t-add-rpaths-to-libraries.patch b/0001-Don-t-add-rpaths-to-libraries.patch
similarity index 88%
rename from 0004-Don-t-add-rpaths-to-libraries.patch
rename to 0001-Don-t-add-rpaths-to-libraries.patch
index cce40f4..5b60aef 100644
--- a/0004-Don-t-add-rpaths-to-libraries.patch
+++ b/0001-Don-t-add-rpaths-to-libraries.patch
@@ -1,7 +1,7 @@
-From 9378a6a792cd1e2f6861483a2a73122b8c5296dd Mon Sep 17 00:00:00 2001
+From d3bc916ff1bc467c503e21015db9c1e2a47a64f2 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 24 Jun 2014 10:00:15 +0100
-Subject: [PATCH 4/9] Don't add rpaths to libraries.
+Subject: [PATCH 1/5] Don't add rpaths to libraries.
 
 ---
  tools/Makefile | 4 ++--
diff --git a/0001-increment-version-number-after-tagging-4.08.1-rc2.patch b/0001-increment-version-number-after-tagging-4.08.1-rc2.patch
deleted file mode 100644
index e286a62..0000000
--- a/0001-increment-version-number-after-tagging-4.08.1-rc2.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-From 92c1042e5ba899fca8eed351a7bc210879cdc9d7 Mon Sep 17 00:00:00 2001
-From: Florian Angeletti <florian.angeletti@inria.fr>
-Date: Wed, 24 Jul 2019 14:25:14 +0200
-Subject: [PATCH 1/9] increment version number after tagging 4.08.1+rc2
-
----
- VERSION             |  2 +-
- configure           | 26 +++++++++++++-------------
- ocaml-variants.opam |  2 +-
- 3 files changed, 15 insertions(+), 15 deletions(-)
-
-diff --git a/VERSION b/VERSION
-index 9bbc45c85..6be2f109a 100644
---- a/VERSION
-+++ b/VERSION
-@@ -1,4 +1,4 @@
--4.08.1+rc2
-+4.08.1+dev4-2019-07-24
- 
- # The version string is the first line of this file.
- # It must be in the format described in stdlib/sys.mli
-diff --git a/configure b/configure
-index 450374d2d..0de9771d3 100755
---- a/configure
-+++ b/configure
-@@ -1,6 +1,6 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.69 for OCaml 4.08.1+rc2.
-+# Generated by GNU Autoconf 2.69 for OCaml 4.08.1+dev4-2019-07-24.
- #
- # Report bugs to <caml-list@inria.fr>.
- #
-@@ -590,8 +590,8 @@ MAKEFLAGS=
- # Identity of this package.
- PACKAGE_NAME='OCaml'
- PACKAGE_TARNAME='ocaml'
--PACKAGE_VERSION='4.08.1+rc2'
--PACKAGE_STRING='OCaml 4.08.1+rc2'
-+PACKAGE_VERSION='4.08.1+dev4-2019-07-24'
-+PACKAGE_STRING='OCaml 4.08.1+dev4-2019-07-24'
- PACKAGE_BUGREPORT='caml-list@inria.fr'
- PACKAGE_URL='http://www.ocaml.org'
- 
-@@ -1430,7 +1430,7 @@ if test "$ac_init_help" = "long"; then
-   # Omit some internal or obsolete options to make the list less imposing.
-   # This message is too long to be a string in the A/UX 3.1 sh.
-   cat <<_ACEOF
--\`configure' configures OCaml 4.08.1+rc2 to adapt to many kinds of systems.
-+\`configure' configures OCaml 4.08.1+dev4-2019-07-24 to adapt to many kinds of systems.
- 
- Usage: $0 [OPTION]... [VAR=VALUE]...
- 
-@@ -1501,7 +1501,7 @@ fi
- 
- if test -n "$ac_init_help"; then
-   case $ac_init_help in
--     short | recursive ) echo "Configuration of OCaml 4.08.1+rc2:";;
-+     short | recursive ) echo "Configuration of OCaml 4.08.1+dev4-2019-07-24:";;
-    esac
-   cat <<\_ACEOF
- 
-@@ -1657,7 +1657,7 @@ fi
- test -n "$ac_init_help" && exit $ac_status
- if $ac_init_version; then
-   cat <<\_ACEOF
--OCaml configure 4.08.1+rc2
-+OCaml configure 4.08.1+dev4-2019-07-24
- generated by GNU Autoconf 2.69
- 
- Copyright (C) 2012 Free Software Foundation, Inc.
-@@ -2320,7 +2320,7 @@ cat >config.log <<_ACEOF
- This file contains any messages produced by compilers while
- running configure, to aid debugging if configure makes a mistake.
- 
--It was created by OCaml $as_me 4.08.1+rc2, which was
-+It was created by OCaml $as_me 4.08.1+dev4-2019-07-24, which was
- generated by GNU Autoconf 2.69.  Invocation command line was
- 
-   $ $0 $@
-@@ -2669,8 +2669,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- 
- 
--{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring OCaml version 4.08.1+rc2" >&5
--$as_echo "$as_me: Configuring OCaml version 4.08.1+rc2" >&6;}
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring OCaml version 4.08.1+dev4-2019-07-24" >&5
-+$as_echo "$as_me: Configuring OCaml version 4.08.1+dev4-2019-07-24" >&6;}
- 
- # Configuration variables
- 
-@@ -2745,7 +2745,7 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
- ## Output variables
- 
- 
--VERSION=4.08.1+rc2
-+VERSION=4.08.1+dev4-2019-07-24
- 
- 
- # Note: This is present for the flexdll bootstrap where it exposed as the old
-@@ -12365,7 +12365,7 @@ case $ocaml_cv_cc_vendor in #(
-   msvc-*) :
-     outputobj=-Fo; CPP="cl -nologo -EP"; gcc_warnings="" ;; #(
-   *) :
--    outputobj='-o $(EMPTY)'; case 4.08.1+rc2 in #(
-+    outputobj='-o $(EMPTY)'; case 4.08.1+dev4-2019-07-24 in #(
-   *+dev*) :
-     gcc_warnings="-Wall -Werror" ;; #(
-   *) :
-@@ -17560,7 +17560,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- # report actual input values of CONFIG_FILES etc. instead of their
- # values after options handling.
- ac_log="
--This file was extended by OCaml $as_me 4.08.1+rc2, which was
-+This file was extended by OCaml $as_me 4.08.1+dev4-2019-07-24, which was
- generated by GNU Autoconf 2.69.  Invocation command line was
- 
-   CONFIG_FILES    = $CONFIG_FILES
-@@ -17627,7 +17627,7 @@ _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
- ac_cs_version="\\
--OCaml config.status 4.08.1+rc2
-+OCaml config.status 4.08.1+dev4-2019-07-24
- configured by $0, generated by GNU Autoconf 2.69,
-   with options \\"\$ac_cs_config\\"
- 
-diff --git a/ocaml-variants.opam b/ocaml-variants.opam
-index dcadf49f8..69b727f5c 100644
---- a/ocaml-variants.opam
-+++ b/ocaml-variants.opam
-@@ -1,5 +1,5 @@
- opam-version: "2.0"
--version: "4.08.1+rc2"
-+version: "4.08.1+trunk"
- synopsis: "OCaml development version"
- depends: [
-   "ocaml" {= "4.08.1" & post}
--- 
-2.22.0.rc3
-
diff --git a/0002-Fix-spelling-errors-reported-by-Lintian.patch b/0002-Fix-spelling-errors-reported-by-Lintian.patch
deleted file mode 100644
index a5497c8..0000000
--- a/0002-Fix-spelling-errors-reported-by-Lintian.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-From 44306329db8a86a2362b6345bdde69deea4935dc Mon Sep 17 00:00:00 2001
-From: David Allsopp <david.allsopp@metastack.com>
-Date: Wed, 24 Jul 2019 14:45:33 +0100
-Subject: [PATCH 2/9] Fix spelling errors reported by Lintian
-
-No change entry needed
----
- asmcomp/cmmgen.ml                                         | 4 ++--
- manual/manual/library/compilerlibs.etex                   | 2 +-
- middle_end/inlining_transforms.ml                         | 2 +-
- otherlibs/systhreads/event.mli                            | 4 ++--
- parsing/ast_iterator.mli                                  | 2 +-
- parsing/ast_mapper.mli                                    | 2 +-
- stdlib/bigarray.mli                                       | 2 +-
- stdlib/filename.mli                                       | 4 ++--
- stdlib/format.ml                                          | 2 +-
- testsuite/tests/parsetree/source.ml                       | 2 +-
- testsuite/tests/typing-implicit_unpack/implicit_unpack.ml | 2 +-
- 11 files changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/asmcomp/cmmgen.ml b/asmcomp/cmmgen.ml
-index d0490998c..68e36d0d9 100644
---- a/asmcomp/cmmgen.ml
-+++ b/asmcomp/cmmgen.ml
-@@ -1528,8 +1528,8 @@ end
-    phases, we only share exits *)
- (* Some specific patterns can lead to switches where several cases
-    point to the same action, but this action is not an exit (see GPR#1370).
--   The addition of the index in the action array as context allows to
--   share them correctly without duplication. *)
-+   The addition of the index in the action array as context allows
-+   sharing them correctly without duplication. *)
- module StoreExpForSwitch =
-   Switch.CtxStore
-     (struct
-diff --git a/manual/manual/library/compilerlibs.etex b/manual/manual/library/compilerlibs.etex
-index 88abbb823..d49193767 100644
---- a/manual/manual/library/compilerlibs.etex
-+++ b/manual/manual/library/compilerlibs.etex
-@@ -3,7 +3,7 @@
- 
- This chapter describes the OCaml front-end, which declares the abstract
- syntax tree used by the compiler, provides a way to parse, print
--and pretty-print OCaml code, and ultimately allows to write abstract
-+and pretty-print OCaml code, and ultimately allows one to write abstract
- syntax tree preprocessors invoked via the {\tt -ppx} flag (see chapters~\ref{c:camlc}
- and~\ref{c:nativecomp}) and plugins invoked via the {\tt -plugin} flag
- (see chapter~\ref{c:plugins}).
-diff --git a/middle_end/inlining_transforms.ml b/middle_end/inlining_transforms.ml
-index b08e62bb0..c46a6cbe6 100755
---- a/middle_end/inlining_transforms.ml
-+++ b/middle_end/inlining_transforms.ml
-@@ -118,7 +118,7 @@ let inline_by_copying_function_body ~env ~r
-     && ((not default_inline) || (not default_specialise)) then
-       (* When the function inlined function is a stub, the annotation
-          is reported to the function applications inside the stub.
--         This allows to report the annotation to the application the
-+         This allows reporting the annotation to the application the
-          original programmer really intended: the stub is not visible
-          in the source. *)
-       set_inline_attribute_on_all_apply body
-diff --git a/otherlibs/systhreads/event.mli b/otherlibs/systhreads/event.mli
-index 83dbe9a17..fd452652c 100644
---- a/otherlibs/systhreads/event.mli
-+++ b/otherlibs/systhreads/event.mli
-@@ -59,8 +59,8 @@ val wrap_abort : 'a event -> (unit -> unit) -> 'a event
- 
- val guard : (unit -> 'a event) -> 'a event
- (** [guard fn] returns the event that, when synchronized, computes
--   [fn()] and behaves as the resulting event. This allows to
--   compute events with side-effects at the time of the synchronization
-+   [fn()] and behaves as the resulting event. This enables
-+   computing events with side-effects at the time of the synchronization
-    operation. *)
- 
- val sync : 'a event -> 'a
-diff --git a/parsing/ast_iterator.mli b/parsing/ast_iterator.mli
-index 5dc1c0ec5..26308d20d 100755
---- a/parsing/ast_iterator.mli
-+++ b/parsing/ast_iterator.mli
-@@ -13,7 +13,7 @@
- (*                                                                        *)
- (**************************************************************************)
- 
--(** {!iterator} allows to implement AST inspection using open recursion.  A
-+(** {!iterator} enables AST inspection using open recursion.  A
-     typical mapper would be based on {!default_iterator}, a trivial iterator,
-     and will fall back on it for handling the syntax it does not modify.
- 
-diff --git a/parsing/ast_mapper.mli b/parsing/ast_mapper.mli
-index b342ca8a9..80d70fcca 100644
---- a/parsing/ast_mapper.mli
-+++ b/parsing/ast_mapper.mli
-@@ -21,7 +21,7 @@
-   the -ppx rewriters, handling such details as the serialization format,
-   forwarding of command-line flags, and storing state.
- 
--  {!mapper} allows to implement AST rewriting using open recursion.
-+  {!mapper} enables AST rewriting using open recursion.
-   A typical mapper would be based on {!default_mapper}, a deep
-   identity mapper, and will fall back on it for handling the syntax it
-   does not modify. For example:
-diff --git a/stdlib/bigarray.mli b/stdlib/bigarray.mli
-index 2c1261212..ea26f66f5 100644
---- a/stdlib/bigarray.mli
-+++ b/stdlib/bigarray.mli
-@@ -133,7 +133,7 @@ type ('a, 'b) kind =
-    of OCaml types with element kinds, and are re-exported below for
-    backward-compatibility reasons.
- 
--   Using a generalized algebraic datatype (GADT) here allows to write
-+   Using a generalized algebraic datatype (GADT) here allows writing
-    well-typed polymorphic functions whose return type depend on the
-    argument type, such as:
- 
-diff --git a/stdlib/filename.mli b/stdlib/filename.mli
-index b05ad0d2e..9221c9ef5 100644
---- a/stdlib/filename.mli
-+++ b/stdlib/filename.mli
-@@ -52,8 +52,8 @@ val check_suffix : string -> string -> bool
- val chop_suffix : string -> string -> string
- (** [chop_suffix name suff] removes the suffix [suff] from
-    the filename [name]. The behavior is undefined if [name] does not
--   end with the suffix [suff]. It is thus recommmended to use
--   [chop_suffix_opt] instead.
-+   end with the suffix [suff]. [chop_suffix_opt] is thus recommended
-+   instead.
- *)
- 
- val chop_suffix_opt: suffix:string -> string -> string option
-diff --git a/stdlib/format.ml b/stdlib/format.ml
-index ae1f3c647..369c50c36 100644
---- a/stdlib/format.ml
-+++ b/stdlib/format.ml
-@@ -687,7 +687,7 @@ let pp_print_if_newline state () =
-       { size = Size.zero; token = Pp_if_newline; length = 0 }
- 
- 
--(* Generalized break hint that allows to print strings before/after
-+(* Generalized break hint that allows printing strings before/after
-    same-line offset (width) or new-line offset *)
- let pp_print_custom_break state ~fits ~breaks =
-   let before, width, after = fits in
-diff --git a/testsuite/tests/parsetree/source.ml b/testsuite/tests/parsetree/source.ml
-index c67012e18..a183f4482 100644
---- a/testsuite/tests/parsetree/source.ml
-+++ b/testsuite/tests/parsetree/source.ml
-@@ -3072,7 +3072,7 @@ Error: Types marked with the immediate attribute must be
-        non-pointer types like int or bool
- |}];;
- (*
--   Implicit unpack allows to omit the signature in (val ...) expressions.
-+   Implicit unpack allows the signature in (val ...) expressions to be omitted.
- 
-    It also adds (module M : S) and (module M) patterns, relying on
-    implicit (val ...) for the implementation. Such patterns can only
-diff --git a/testsuite/tests/typing-implicit_unpack/implicit_unpack.ml b/testsuite/tests/typing-implicit_unpack/implicit_unpack.ml
-index a6b4d697c..e503ee736 100644
---- a/testsuite/tests/typing-implicit_unpack/implicit_unpack.ml
-+++ b/testsuite/tests/typing-implicit_unpack/implicit_unpack.ml
-@@ -3,7 +3,7 @@
- *)
- 
- (*
--   Implicit unpack allows to omit the signature in (val ...) expressions.
-+   Implicit unpack allows the signature in (val ...) expressions to be omitted.
- 
-    It also adds (module M : S) and (module M) patterns, relying on
-    implicit (val ...) for the implementation. Such patterns can only
--- 
-2.22.0.rc3
-
diff --git a/0005-configure-Allow-user-defined-C-compiler-flags.patch b/0002-configure-Allow-user-defined-C-compiler-flags.patch
similarity index 78%
rename from 0005-configure-Allow-user-defined-C-compiler-flags.patch
rename to 0002-configure-Allow-user-defined-C-compiler-flags.patch
index 2ba82c7..093be83 100644
--- a/0005-configure-Allow-user-defined-C-compiler-flags.patch
+++ b/0002-configure-Allow-user-defined-C-compiler-flags.patch
@@ -1,14 +1,14 @@
-From 4af3619375230488b370e5b3d5a8f48cef688607 Mon Sep 17 00:00:00 2001
+From 8cc56a1515816c9cef84694e63eaed63a0474090 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 29 May 2012 20:44:18 +0100
-Subject: [PATCH 5/9] configure: Allow user defined C compiler flags.
+Subject: [PATCH 2/5] configure: Allow user defined C compiler flags.
 
 ---
  configure.ac | 4 ++++
  1 file changed, 4 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index 5bb061162..6e37ff6c0 100644
+index f5d8a2687..ad5b701bd 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -553,6 +553,10 @@ AS_CASE([$host],
diff --git a/0003-Fix-language-of-some-error-messages-in-ocamldoc.patch b/0003-Fix-language-of-some-error-messages-in-ocamldoc.patch
deleted file mode 100644
index f0313e9..0000000
--- a/0003-Fix-language-of-some-error-messages-in-ocamldoc.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 655519a3653a8e5b90e0fd862f9c5e20465ab7d0 Mon Sep 17 00:00:00 2001
-From: Stephane Glondu <steph@glondu.net>
-Date: Thu, 25 Jul 2019 09:08:03 +0200
-Subject: [PATCH 3/9] Fix language of some error messages in ocamldoc
-
-No change entry needed
----
- ocamldoc/odoc_sig.ml | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/ocamldoc/odoc_sig.ml b/ocamldoc/odoc_sig.ml
-index fb2eac671..e413c11a6 100644
---- a/ocamldoc/odoc_sig.ml
-+++ b/ocamldoc/odoc_sig.ml
-@@ -1740,11 +1740,11 @@ module Analyser =
-             )
-           else
-             (
--             raise (Failure "Parsetree.Pcty_arrow (parse_label, _, pclass_type), labels differents")
-+             raise (Failure "Parsetree.Pcty_arrow (parse_label, _, pclass_type), different labels")
-             )
- 
-       | _ ->
--          raise (Failure "analyse_class_kind pas de correspondance dans le match")
-+          raise (Failure "analyse_class_kind: match failure")
- 
-     (** Analyse of a Parsetree.class_type and a Types.class_type to return a class_type_kind.*)
-     and analyse_class_type_kind env current_class_name last_pos parse_class_type sig_class_type =
-@@ -1799,7 +1799,7 @@ module Analyser =
-            ([], k)
- *)
-       | _ ->
--          raise (Failure "analyse_class_type_kind pas de correspondance dans le match")
-+          raise (Failure "analyse_class_type_kind: match failure")
- 
-     let analyse_signature source_file input_file
-         (ast : Parsetree.signature) (signat : Types.signature) =
--- 
-2.22.0.rc3
-
diff --git a/0006-configure-Remove-incorrect-assumption-about-cross-co.patch b/0003-configure-Remove-incorrect-assumption-about-cross-co.patch
similarity index 61%
rename from 0006-configure-Remove-incorrect-assumption-about-cross-co.patch
rename to 0003-configure-Remove-incorrect-assumption-about-cross-co.patch
index 933a1cf..99bca0e 100644
--- a/0006-configure-Remove-incorrect-assumption-about-cross-co.patch
+++ b/0003-configure-Remove-incorrect-assumption-about-cross-co.patch
@@ -1,7 +1,7 @@
-From 84381bccf6293903392d3d045bfb66b10b3e3bc3 Mon Sep 17 00:00:00 2001
+From 0204a1137a8e8058afd1665aa6112656bc7bf0be Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Fri, 26 Apr 2019 16:16:29 +0100
-Subject: [PATCH 6/9] configure: Remove incorrect assumption about
+Subject: [PATCH 3/5] configure: Remove incorrect assumption about
  cross-compiling.
 
 See https://github.com/ocaml/ocaml/issues/8647#issuecomment-487094390
@@ -10,15 +10,15 @@ See https://github.com/ocaml/ocaml/issues/8647#issuecomment-487094390
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index 6e37ff6c0..3c287fbd0 100644
+index ad5b701bd..2227769e8 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -958,7 +958,7 @@ AS_CASE([$host],
+@@ -959,7 +959,7 @@ AS_CASE([$host],
    [*-*-mingw32|*-pc-windows], [asppprofflags=''],
    [asppprofflags='-DPROFILING'])
  
--AS_IF([test -n "$host_alias"], [toolpref="${host}-"], [toolpref=""])
-+#AS_IF([test -n "$host_alias"], [toolpref="${host}-"], [toolpref=""])
+-AS_IF([test -n "$host_alias"], [toolpref="${host_alias}-"], [toolpref=""])
++#AS_IF([test -n "$host_alias"], [toolpref="${host_alias}-"], [toolpref=""])
  
  # We first compute default values for as and aspp
  # If values have been given by the user then they take precedence over
diff --git a/0007-Add-RISC-V-backend.patch b/0004-Add-RISC-V-backend.patch
similarity index 99%
rename from 0007-Add-RISC-V-backend.patch
rename to 0004-Add-RISC-V-backend.patch
index 7b17ec6..63ceeb6 100644
--- a/0007-Add-RISC-V-backend.patch
+++ b/0004-Add-RISC-V-backend.patch
@@ -1,7 +1,7 @@
-From b4554d2e93dd2db471b4498761824875e41adc8c Mon Sep 17 00:00:00 2001
+From acc93802cac96da98ad5468756da2025625ca416 Mon Sep 17 00:00:00 2001
 From: Nicolas Ojeda Bar <n.oje.bar@gmail.com>
 Date: Fri, 27 Oct 2017 17:05:25 +0200
-Subject: [PATCH 7/9] Add RISC-V backend
+Subject: [PATCH 4/5] Add RISC-V backend
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -6077,10 +6077,10 @@ index 8b612ab89..3b4c7624b 100755
  # time-stamp-format: "%:y-%02m-%02d"
  # time-stamp-end: "'"
 diff --git a/configure b/configure
-index 0de9771d3..33a0aa526 100755
+index 9a78a4554..00bb37bae 100755
 --- a/configure
 +++ b/configure
-@@ -13417,6 +13417,8 @@ fi ;; #(
+@@ -13415,6 +13415,8 @@ fi ;; #(
      natdynlink=true ;; #(
    aarch64-*-linux*) :
      natdynlink=true ;; #(
@@ -6112,10 +6112,10 @@ index 0de9771d3..33a0aa526 100755
      case $ocaml_cv_cc_vendor in #(
    clang-*) :
 diff --git a/configure.ac b/configure.ac
-index 3c287fbd0..5731e0f98 100644
+index 2227769e8..94b7e2b35 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -804,7 +804,8 @@ AS_IF([test x"$enable_shared" != "xno"],
+@@ -803,7 +803,8 @@ AS_IF([test x"$enable_shared" != "xno"],
      [arm*-*-linux*], [natdynlink=true],
      [arm*-*-freebsd*], [natdynlink=true],
      [earm*-*-netbsd*], [natdynlink=true],
@@ -6125,7 +6125,7 @@ index 3c287fbd0..5731e0f98 100644
  
  # Try to work around the Skylake/Kaby Lake processor bug.
  AS_CASE(["$CC,$host"],
-@@ -897,7 +898,11 @@ AS_CASE([$host],
+@@ -898,7 +899,11 @@ AS_CASE([$host],
    [aarch64-*-linux*],
      [arch=arm64; system=linux],
    [x86_64-*-cygwin*],
@@ -6138,7 +6138,7 @@ index 3c287fbd0..5731e0f98 100644
  )
  
  AS_IF([test x"$enable_native_compiler" = "xno"],
-@@ -1007,7 +1012,7 @@ AS_CASE(["$arch,$system"],
+@@ -1008,7 +1013,7 @@ AS_CASE(["$arch,$system"],
    [*,freebsd],
      [default_as="${toolpref}as"
      default_aspp="${toolpref}cc -c"],
diff --git a/0008-riscv-Emit-debug-info.patch b/0005-riscv-Emit-debug-info.patch
similarity index 90%
rename from 0008-riscv-Emit-debug-info.patch
rename to 0005-riscv-Emit-debug-info.patch
index c099edf..ff732cf 100644
--- a/0008-riscv-Emit-debug-info.patch
+++ b/0005-riscv-Emit-debug-info.patch
@@ -1,7 +1,7 @@
-From e238841a2e41f4473dcc40a06a7ac1b9ad1c0357 Mon Sep 17 00:00:00 2001
+From 2f23a53b4aa1b672b3919cc021b83548f713b90a Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 5 Jun 2018 19:48:08 +0000
-Subject: [PATCH 8/9] riscv: Emit debug info.
+Subject: [PATCH 5/5] riscv: Emit debug info.
 
 ---
  asmcomp/riscv/emit.mlp | 3 +++
diff --git a/0009-Use-the-autoconf-or-system-provided-off_t-rather-tha.patch b/0009-Use-the-autoconf-or-system-provided-off_t-rather-tha.patch
deleted file mode 100644
index 9353c5c..0000000
--- a/0009-Use-the-autoconf-or-system-provided-off_t-rather-tha.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 9217fab965cbde2a47dd91acb6e6452844d288ba Mon Sep 17 00:00:00 2001
-From: Stephen Dolan <sdolan@janestreet.com>
-Date: Mon, 29 Jul 2019 14:12:56 +0100
-Subject: [PATCH 9/9] Use the autoconf- or system-provided off_t rather than
- redetecting.
-
-Hopefully fixes #8841
----
- configure         | 2 --
- configure.ac      | 1 -
- runtime/caml/io.h | 4 +---
- 3 files changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/configure b/configure
-index 33a0aa526..a43846117 100755
---- a/configure
-+++ b/configure
-@@ -12787,8 +12787,6 @@ _ACEOF
- 
- fi
- 
--$as_echo "#define HAS_OFF_T 1" >>confdefs.h
--
- 
- # Checks for structures
- 
-diff --git a/configure.ac b/configure.ac
-index 5731e0f98..38ff1235f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -674,7 +674,6 @@ AC_CHECK_HEADER([sys/select.h], [AC_DEFINE([HAS_SYS_SELECT_H])], [],
- 
- ## off_t
- AC_TYPE_OFF_T
--AC_DEFINE([HAS_OFF_T])
- 
- # Checks for structures
- 
-diff --git a/runtime/caml/io.h b/runtime/caml/io.h
-index 87de679e5..2d961f956 100644
---- a/runtime/caml/io.h
-+++ b/runtime/caml/io.h
-@@ -29,11 +29,9 @@
- 
- #if defined(_WIN32)
- typedef __int64 file_offset;
--#elif defined(HAS_OFF_T)
-+#else
- #include <sys/types.h>
- typedef off_t file_offset;
--#else
--typedef long file_offset;
- #endif
- 
- struct channel {
--- 
-2.22.0.rc3
-
diff --git a/ocaml.spec b/ocaml.spec
index 41f8bfa..bb793d0 100644
--- a/ocaml.spec
+++ b/ocaml.spec
@@ -26,12 +26,12 @@
 # Architectures where parallel builds fail.
 #%global no_parallel_build_arches aarch64
 
-#%global rcver %{nil}
-%global rcver +rc2
+%global rcver %{nil}
+#global rcver +rc2
 
 Name:           ocaml
 Version:        4.08.1
-Release:        0.rc2.1%{?dist}
+Release:        1%{?dist}
 
 Summary:        OCaml compiler and programming environment
 
@@ -50,26 +50,21 @@ Source0:        http://caml.inria.fr/pub/distrib/ocaml-4.08/ocaml-%{version}%{rc
 #
 # https://pagure.io/fedora-ocaml
 #
-# Current branch: fedora-31-4.08.1
+# Current branch: fedora-32-4.08.1
 #
 # ALTERNATIVELY add a patch to the end of the list (leaving the
 # existing patches unchanged) adding a comment to note that it should
 # be incorporated into the git repo at a later time.
 #
 
-Patch0001:      0001-increment-version-number-after-tagging-4.08.1-rc2.patch
-Patch0002:      0002-Fix-spelling-errors-reported-by-Lintian.patch
-Patch0003:      0003-Fix-language-of-some-error-messages-in-ocamldoc.patch
 # Fedora-specific downstream patches.
-Patch0004:      0004-Don-t-add-rpaths-to-libraries.patch
-Patch0005:      0005-configure-Allow-user-defined-C-compiler-flags.patch
-Patch0006:      0006-configure-Remove-incorrect-assumption-about-cross-co.patch
+Patch0001:      0001-Don-t-add-rpaths-to-libraries.patch
+Patch0002:      0002-configure-Allow-user-defined-C-compiler-flags.patch
+Patch0003:      0003-configure-Remove-incorrect-assumption-about-cross-co.patch
 # Out of tree patch for RISC-V support.
 # https://github.com/nojb/riscv-ocaml
-Patch0007:      0007-Add-RISC-V-backend.patch
-Patch0008:      0008-riscv-Emit-debug-info.patch
-# Fix for https://github.com/ocaml/ocaml/issues/8841
-Patch0009:      0009-Use-the-autoconf-or-system-provided-off_t-rather-tha.patch
+Patch0004:      0004-Add-RISC-V-backend.patch
+Patch0005:      0005-riscv-Emit-debug-info.patch
 
 BuildRequires:  gcc
 BuildRequires:  autoconf
@@ -386,6 +381,9 @@ find $RPM_BUILD_ROOT \( -name '*.cmt' -o -name '*.cmti' \) -a -delete
 
 
 %changelog
+* Fri Aug 16 2019 Richard W.M. Jones <rjones@redhat.com> - 4.08.1-1
+- OCaml 4.08.1 final.
+
 * Tue Jul 30 2019 Richard W.M. Jones <rjones@redhat.com> - 4.08.1-0.rc2.1
 - OCaml 4.08.1+rc2.
 - Include fix for miscompilation of off_t on 32 bit architectures.
diff --git a/sources b/sources
index 1e7ae92..af4a53c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ocaml-4.08.1+rc2.tar.xz) = 74d5929e75ec4dd6cd69250005a18cede7e8036301dc05660aee99330f1ba4013575df1f9fe03dc7e913de3719215122b71681f0fad6f571a5feecb594c1e460
+SHA512 (ocaml-4.08.1.tar.xz) = ebcc065c4cc4bf16256c6dad6795d9660d355c5facbe432591811dc4aa02af6498899219ec4e786358dffcfc38c68f5af2d1c3787d418a78732ec37e84a28cd4