diff --git a/0001-Don-t-add-rpaths-to-libraries.patch b/0001-Don-t-add-rpaths-to-libraries.patch
index 225fcbf..401d752 100644
--- a/0001-Don-t-add-rpaths-to-libraries.patch
+++ b/0001-Don-t-add-rpaths-to-libraries.patch
@@ -1,4 +1,4 @@
-From 4e42fcf72faacc4394fcb2e6c007c3dab60423d7 Mon Sep 17 00:00:00 2001
+From fc5ac0d955afce294fe58a20cab8e9dda572de78 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 1/4] Don't add rpaths to libraries.
diff --git a/0002-ocamlbyteinfo-ocamlplugininfo-Useful-utilities-from-.patch b/0002-ocamlbyteinfo-ocamlplugininfo-Useful-utilities-from-.patch
index c5e453f..7bba96c 100644
--- a/0002-ocamlbyteinfo-ocamlplugininfo-Useful-utilities-from-.patch
+++ b/0002-ocamlbyteinfo-ocamlplugininfo-Useful-utilities-from-.patch
@@ -1,4 +1,4 @@
-From 1ad7a315e15abfc3eacd199d0e865849204af29c Mon Sep 17 00:00:00 2001
+From 61bdb02cedd1be6ecdc37bc4a80ffe3f19aa5521 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 29 May 2012 20:40:36 +0100
 Subject: [PATCH 2/4] ocamlbyteinfo, ocamlplugininfo: Useful utilities from
diff --git a/0003-configure-Allow-user-defined-C-compiler-flags.patch b/0003-configure-Allow-user-defined-C-compiler-flags.patch
index f935ef8..c233017 100644
--- a/0003-configure-Allow-user-defined-C-compiler-flags.patch
+++ b/0003-configure-Allow-user-defined-C-compiler-flags.patch
@@ -1,4 +1,4 @@
-From 1fbe91a9effb87f018f0a5234fd85f2742128279 Mon Sep 17 00:00:00 2001
+From 2f93494aea56c9216bb561800a6861b653f409ce 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 3/4] configure: Allow user defined C compiler flags.
@@ -8,7 +8,7 @@ Subject: [PATCH 3/4] configure: Allow user defined C compiler flags.
  1 file changed, 4 insertions(+)
 
 diff --git a/configure b/configure
-index ef002cc..5121666 100755
+index f43893a..41c9315 100755
 --- a/configure
 +++ b/configure
 @@ -1901,6 +1901,10 @@ if $with_fpic; then
diff --git a/0004-Don-t-rewrite-Werror.patch b/0004-Don-t-rewrite-Werror.patch
index 06d13fb..a273ba5 100644
--- a/0004-Don-t-rewrite-Werror.patch
+++ b/0004-Don-t-rewrite-Werror.patch
@@ -1,4 +1,4 @@
-From 5e378e1b4f3b8a0697962f95383bf1796cbc36f8 Mon Sep 17 00:00:00 2001
+From cdd42ba82210bfaa97cfa010eaac3d805b80cb49 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Thu, 3 Nov 2016 19:50:20 +0000
 Subject: [PATCH 4/4] Don't rewrite -Werror.
diff --git a/ocaml.spec b/ocaml.spec
index 375cc6f..d635272 100644
--- a/ocaml.spec
+++ b/ocaml.spec
@@ -27,7 +27,7 @@
 
 Name:           ocaml
 Version:        4.04.0
-Release:        0.1.beta2%{?dist}
+Release:        1%{?dist}
 
 Summary:        OCaml compiler and programming environment
 
@@ -35,12 +35,11 @@ License:        QPL and (LGPLv2+ with exceptions)
 
 URL:            http://www.ocaml.org
 
-#Source0:        http://caml.inria.fr/pub/distrib/ocaml-4.04/ocaml-%{version}.tar.gz
-Source0:        https://github.com/ocaml/ocaml/archive/4.04.0+beta2.tar.gz
+Source0:        http://caml.inria.fr/pub/distrib/ocaml-4.04/ocaml-%{version}.tar.gz
 
-Source1:        http://caml.inria.fr/pub/distrib/ocaml-4.03/ocaml-4.03-refman-html.tar.gz
-Source2:        http://caml.inria.fr/pub/distrib/ocaml-4.03/ocaml-4.03-refman.pdf
-Source3:        http://caml.inria.fr/pub/distrib/ocaml-4.03/ocaml-4.03-refman.info.tar.gz
+Source1:        http://caml.inria.fr/pub/distrib/ocaml-4.04/ocaml-4.04-refman-html.tar.gz
+Source2:        http://caml.inria.fr/pub/distrib/ocaml-4.04/ocaml-4.04-refman.pdf
+Source3:        http://caml.inria.fr/pub/distrib/ocaml-4.04/ocaml-4.04-refman.info.tar.gz
 
 # IMPORTANT NOTE:
 #
@@ -51,7 +50,7 @@ Source3:        http://caml.inria.fr/pub/distrib/ocaml-4.03/ocaml-4.03-refman.in
 #
 # https://git.fedorahosted.org/cgit/fedora-ocaml.git/
 #
-# Current branch: fedora-26-4.04.0-beta2
+# Current branch: fedora-26-4.04.0
 #
 # ALTERNATIVELY add a patch to the end of the list (leaving the
 # existing patches unchanged) adding a comment to note that it should
@@ -187,9 +186,9 @@ may not be portable between versions.
 
 
 %prep
-%setup -q -T -b 0 -n %{name}-%{version}-beta2
-%setup -q -T -D -a 1 -n %{name}-%{version}-beta2
-%setup -q -T -D -a 3 -n %{name}-%{version}-beta2
+%setup -q -T -b 0 -n %{name}-%{version}
+%setup -q -T -D -a 1 -n %{name}-%{version}
+%setup -q -T -D -a 3 -n %{name}-%{version}
 cp %{SOURCE2} refman.pdf
 %autopatch -p1
 
@@ -437,6 +436,9 @@ fi
 
 
 %changelog
+* Fri Nov 04 2016 Richard W.M. Jones <rjones@redhat.com> - 4.04.0-1
+- New upstream version 4.04.0.
+
 * Thu Nov 03 2016 Richard W.M. Jones <rjones@redhat.com> - 4.04.0-0.1.beta2
 - New upstream version 4.04.0+beta2.
 - Remove our downstream ppc64 backends, and switch to upstream power backend.
diff --git a/sources b/sources
index f34320d..4972d40 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-92570f6b3cecf04427c3d30f9ffaff4d  4.04.0+beta2.tar.gz
-d3e44d3984d029d2e88ba219ad8e24c2  ocaml-4.03-refman-html.tar.gz
-4cf4acfe6b2a09610918bb9989595125  ocaml-4.03-refman.info.tar.gz
-b331d36a2913348ac27a0f24aaa03871  ocaml-4.03-refman.pdf
+496f99822133bb905171bae8f64b7be4  ocaml-4.04.0.tar.gz
+5c58a4fce99b20e02c3208ad956bcb9d  ocaml-4.04-refman-html.tar.gz
+8c9df1da0e36a69817f43115fa87360c  ocaml-4.04-refman.info.tar.gz
+69342c456bcc7ef1c3a76cca1e9c0ec8  ocaml-4.04-refman.pdf