diff --git a/.gitignore b/.gitignore
index 34c6d8e..a4f8a1c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,5 @@ clog
 /redis-3.2.11.tar.gz
 /redis-4.0.2.tar.gz
 /redis-doc-69a5512.tar.gz
+/redis-4.0.4.tar.gz
+/redis-doc-dc402c6.tar.gz
diff --git a/redis.spec b/redis.spec
index 74af30e..b010a13 100644
--- a/redis.spec
+++ b/redis.spec
@@ -31,14 +31,14 @@
 
 # Commit IDs for the (unversioned) redis-doc repository
 # https://fedoraproject.org/wiki/Packaging:SourceURL "Commit Revision"
-%global doc_commit 69a5512ae6a4ec77d7b1d0af6aac2224e8e83f95
+%global doc_commit dc402c61da3c015e49eb6fd00e4a0564d122d645
 %global short_doc_commit %(c=%{doc_commit}; echo ${c:0:7})
 
 # %%{rpmmacrodir} not usable on EL-6
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:              redis
-Version:           4.0.3
+Version:           4.0.4
 Release:           1%{?dist}
 Summary:           A persistent key-value database
 License:           BSD
@@ -377,6 +377,11 @@ fi
 
 
 %changelog
+* Fri Dec 01 2017 Nathan Scott <nathans@redhat.com> - 4.0.4-1
+- Upstream 4.0.4 release.
+- Update to current upstream redis-doc also.
+- Fix man page issues (RHBZ #1513594 and RHBZ #1515417).
+
 * Thu Nov 30 2017 Remi Collet <remi@remirepo.net> - 4.0.3-1
 - Redis 4.0.3
 - fix ownership of /usr/share/doc/redis
diff --git a/sources b/sources
index af20ea9..c4b044f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (redis-4.0.2.tar.gz) = 1458909c6fc16cff8ca5e6dddff23b988ee1e447f2d0bccf5941553b22bab6abb851732b3fe53dafb8a69d6c0939c3ce7e0686d51e03be720fb018c038d3b1b4
-SHA512 (redis-doc-69a5512.tar.gz) = 0b5a8f48dbddafcc0322f7740180d760ad470bbfb2e1653195f4cb7af786795bf40bd43f39691a2905929addb8a4efa498963d70974a0f0b9ea6e84ccf039760
+SHA512 (redis-4.0.4.tar.gz) = 5874c4185df530299b8908478b034d322815bda4a9cef015c7a295a0c9ffc90259ab2650d54ee7d46a9517c8436a302c21deed77e51e4fc589cbb29a1a16f152
+SHA512 (redis-doc-dc402c6.tar.gz) = 1a37ce1ce598d2b1cb3200e74ee30e302c4174ac24cd9f6cdbc16183d0881ac32a2e1c003a6174607fc19286a75f52bc60e817490904f96f055a3a59aa7b92b7