diff --git a/README.md b/README.md
index 88c02847d..46e9c3c69 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ tl;dr
 -----
 
 * message queue system
-* runs stand-alone ([download](https://s3-eu-west-1.amazonaws.com/softwaremill-public/elasticmq-server-0.13.5.jar)) or embedded
+* runs stand-alone ([download](https://s3-eu-west-1.amazonaws.com/softwaremill-public/elasticmq-server-0.13.6.jar)) or embedded
 * [Amazon SQS](http://aws.amazon.com/sqs/)-compatible interface
 * fully asynchronous implementation, no blocking calls
 
@@ -43,18 +43,18 @@ Installation: stand-alone
 -------------------------
 
 You can download the stand-alone distribution here:
-[https://s3/.../elasticmq-server-0.13.5.jar](https://s3-eu-west-1.amazonaws.com/softwaremill-public/elasticmq-server-0.13.5.jar)
+[https://s3/.../elasticmq-server-0.13.6.jar](https://s3-eu-west-1.amazonaws.com/softwaremill-public/elasticmq-server-0.13.6.jar)
 
 Java 8 or above is required for running the server.
 
 Simply run the jar and you should get a working server, which binds to `localhost:9324`:
 
-    java -jar elasticmq-server-0.13.5.jar
+    java -jar elasticmq-server-0.13.6.jar
 
 ElasticMQ uses [Typesafe Config](https://github.com/typesafehub/config) for configuration. To specify custom
 configuration values, create a file (e.g. `custom.conf`), fill it in with the desired values, and pass it to the server:
 
-    java -Dconfig.file=custom.conf -jar elasticmq-server-0.13.5.jar
+    java -Dconfig.file=custom.conf -jar elasticmq-server-0.13.6.jar
 
 The config file may contain any configuration for Akka and ElasticMQ. Current ElasticMQ configuration values are:
 
@@ -91,7 +91,7 @@ You can also provide an alternative [Logback](http://logback.qos.ch/) configurat
 [default](server/src/main/resources/logback.xml) is configured to
 log INFO logs and above to the console):
 
-    java -Dlogback.configurationFile=my_logback.xml -jar elasticmq-server-0.13.5.jar
+    java -Dlogback.configurationFile=my_logback.xml -jar elasticmq-server-0.13.6.jar
 
 How are queue URLs created
 --------------------------
@@ -197,7 +197,7 @@ ElasticMQ dependencies in SBT
 -----------------------------
 
     // Scala 2.12 and 2.11
-    val elasticmqSqs        = "org.elasticmq" %% "elasticmq-rest-sqs"         % "0.13.5"
+    val elasticmqSqs        = "org.elasticmq" %% "elasticmq-rest-sqs"         % "0.13.6"
 
     // Scala 2.10
     val elasticmqSqs        = "org.elasticmq" %% "elasticmq-rest-sqs"         % "0.7.1"
@@ -205,7 +205,7 @@ ElasticMQ dependencies in SBT
 If you don't want the SQS interface, but just use the actors directly, you can add a dependency only to the `core`
 module:
 
-    val elasticmqCore       = "org.elasticmq" %% "elasticmq-core"             % "0.13.5"
+    val elasticmqCore       = "org.elasticmq" %% "elasticmq-core"             % "0.13.6"
 
 If you want to use a snapshot version, you will need to add the [https://oss.sonatype.org/content/repositories/snapshots/](https://oss.sonatype.org/content/repositories/snapshots/) repository to your configuration.
 
@@ -217,7 +217,7 @@ Dependencies:
     <dependency>
         <groupId>org.elasticmq</groupId>
         <artifactId>elasticmq-rest-sqs_2.11</artifactId>
-        <version>0.13.5</version>
+        <version>0.13.6</version>
     </dependency>
 
 If you want to use a snapshot version, you will need to add the [https://oss.sonatype.org/content/repositories/snapshots/](https://oss.sonatype.org/content/repositories/snapshots/) repository to your configuration.
@@ -231,9 +231,9 @@ have been discontinued.
 Current versions
 ----------------
 
-*Stable*: 0.13.5, 0.8.12
+*Stable*: 0.13.6, 0.8.12
 
-*Development*: 0.13.5-SNAPSHOT
+*Development*: 0.13.6-SNAPSHOT
 
 Logging
 -------
@@ -299,6 +299,10 @@ Technology
 Change log
 ----------
 
+### Version 0.13.6 (22 June 2017) ###
+
+* bug fixes
+
 ### Version 0.13.5 (26 May 2017) ###
 
 * bug fixes
diff --git a/project/Build.scala b/project/Build.scala
index b68bc4661..b05fa1a8e 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -5,7 +5,7 @@ import sbtassembly.AssemblyKeys._
 object BuildSettings {
   val buildSettings = Defaults.coreDefaultSettings ++ Seq (
     organization  := "org.elasticmq",
-    version       := "0.13.5",
+    version       := "0.13.6",
     scalaVersion  := "2.12.2",
     crossScalaVersions := Seq(scalaVersion.value, "2.11.11"),
 
@@ -55,12 +55,12 @@ object Dependencies {
   val scalatest     = "org.scalatest"             %% "scalatest"            % "3.0.3"
   val awaitility    = "com.jayway.awaitility"     % "awaitility-scala"      % "1.7.0"
 
-  val amazonJavaSdk = "com.amazonaws"             % "aws-java-sdk"          % "1.11.129" exclude ("commons-logging", "commons-logging")
+  val amazonJavaSdk = "com.amazonaws"             % "aws-java-sdk"          % "1.11.153" exclude ("commons-logging", "commons-logging")
 
   val scalaGraph    = "org.scala-graph"           %% "graph-core"           % "1.11.5"
 
-  val akkaVersion      = "2.5.1"
-  val akkaHttpVersion  = "10.0.6"
+  val akkaVersion      = "2.5.3"
+  val akkaHttpVersion  = "10.0.8"
   val akka2Actor       = "com.typesafe.akka" %% "akka-actor"           % akkaVersion
   val akka2Slf4j       = "com.typesafe.akka" %% "akka-slf4j"           % akkaVersion
   val akka2Streams     = "com.typesafe.akka" %% "akka-stream"          % akkaVersion