diff --git a/.travis.yml b/.travis.yml
index 52b6cb81..e37a72fb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ go:
   - tip
 go_import_path: github.com/kataras/iris
 install:
-  - go get ./... # for iris-contrib/httpexpect
+  - go get ./... # for iris-contrib/httpexpect and sirupsen/logrus
 script:
   - go test -v -cover ./...
 after_script:
diff --git a/HISTORY.md b/HISTORY.md
index 05e40dd7..e5373289 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -17,6 +17,26 @@ Developers are not forced to upgrade if they don't really need it. Upgrade whene
 
 **How to upgrade**: Open your command-line and execute this command: `go get -u github.com/kataras/iris`.
 
+# Sa, 22 July 2017 | v8.0.5
+
+No API Changes.
+
+### Django view engine
+
+@corebreaker pushed a [PR](https://github.com/kataras/iris/pull/682) to solve the [Problem for {%extends%} in Django Engine with embedded files](dhttps://github.com/kataras/iris/issues/681).
+
+### Logger
+
+Remove the `vendor/github.com/sirupsen/logrus` folder, as a temporary solution for the https://github.com/kataras/iris/issues/680#issuecomment-316196126.
+
+#### Future versions
+
+The logrus will be replaced with a custom implementation, because of that: https://github.com/kataras/iris/issues/680#issuecomment-316184570. 
+
+As far as we know, @kataras is working on this new implementation, see [here](https://github.com/kataras/iris/issues/680#issuecomment-316544906), 
+which will be compatible with the logrus package and other open-source golang loggers as well.
+
+
 # Mo, 17 July 2017 | v8.0.4
 
 No API changes.
diff --git a/README.md b/README.md
index 65945b54..c58a0988 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ Iris is a fast, simple and efficient micro web framework for Go. It provides a b
 ### 📑 Table of contents
 
 * [Installation](#-installation)
-* [Latest changes](https://github.com/kataras/iris/blob/master/HISTORY.md#mo-17-july-2017--v804)
+* [Latest changes](https://github.com/kataras/iris/blob/master/HISTORY.md#sa-22-july-2017--v805)
 * [Learn](#-learn)
 	* [HTTP Listening](_examples/#http-listening)
 	* [Configuration](_examples/#configuration)
@@ -339,7 +339,7 @@ Thank You for your trust!
 
 ### 📌 Version
 
-Current: **8.0.4**
+Current: **8.0.5**
 
 Each new release is pushed to the master. It stays there until the next version. When a next version is released then the previous version goes to its own branch with `gopkg.in` as its import path (and its own vendor folder), in order to keep it working "for-ever".
 
diff --git a/doc.go b/doc.go
index f701150e..49626a10 100644
--- a/doc.go
+++ b/doc.go
@@ -35,7 +35,7 @@ Source code and other details for the project are available at GitHub:
 
 Current Version
 
-8.0.4
+8.0.5
 
 Installation
 
diff --git a/iris.go b/iris.go
index 70796dd5..c60ab4c0 100644
--- a/iris.go
+++ b/iris.go
@@ -33,7 +33,7 @@ import (
 const (
 
 	// Version is the current version number of the Iris Web Framework.
-	Version = "8.0.4"
+	Version = "8.0.5"
 )
 
 // HTTP status codes as registered with IANA.