diff --git a/handler/src/main/java/io/netty/handler/ssl/SslHandler.java b/handler/src/main/java/io/netty/handler/ssl/SslHandler.java
index 6eac119320..797444d9a9 100644
--- a/handler/src/main/java/io/netty/handler/ssl/SslHandler.java
+++ b/handler/src/main/java/io/netty/handler/ssl/SslHandler.java
@@ -1,4 +1,4 @@
-/*
+io.netty.channel.DefaultChannelPromise.setFailure/*
  * Copyright 2012 The Netty Project
  *
  * The Netty Project licenses this file to you under the Apache License,
@@ -1052,12 +1052,12 @@ public class SslHandler
         }
 
         @Override
-        public void setSuccess() {
+        public ChannelPromise setSuccess() {
             throw new IllegalStateException();
         }
 
         @Override
-        public void setFailure(Throwable cause) {
+        public ChannelPromise setFailure(Throwable cause) {
             throw new IllegalStateException();
         }
     }
diff --git a/transport/src/main/java/io/netty/channel/AbstractChannel.java b/transport/src/main/java/io/netty/channel/AbstractChannel.java
index 3915c94852..a8335f5cb7 100644
--- a/transport/src/main/java/io/netty/channel/AbstractChannel.java
+++ b/transport/src/main/java/io/netty/channel/AbstractChannel.java
@@ -1034,12 +1034,12 @@ public abstract class AbstractChannel extends DefaultAttributeMap implements Cha
         }
 
         @Override
-        public void setSuccess() {
+        public ChannelPromise setSuccess() {
             throw new IllegalStateException();
         }
 
         @Override
-        public void setFailure(Throwable cause) {
+        public ChannelPromise setFailure(Throwable cause) {
             throw new IllegalStateException();
         }
 
diff --git a/transport/src/main/java/io/netty/channel/ChannelPromise.java b/transport/src/main/java/io/netty/channel/ChannelPromise.java
index 7f60d28d38..7688abc3e2 100644
--- a/transport/src/main/java/io/netty/channel/ChannelPromise.java
+++ b/transport/src/main/java/io/netty/channel/ChannelPromise.java
@@ -26,7 +26,7 @@ public interface ChannelPromise extends ChannelFuture {
      *
      * If it is success or failed already it will throw an {@link IllegalStateException}.
      */
-    void setSuccess();
+    ChannelPromise setSuccess();
 
     /**
      * Marks this future as a success and notifies all
@@ -44,7 +44,7 @@ public interface ChannelPromise extends ChannelFuture {
      *
      * If it is success or failed already it will throw an {@link IllegalStateException}.
      */
-    void setFailure(Throwable cause);
+    ChannelPromise setFailure(Throwable cause);
 
     /**
      * Marks this future as a failure and notifies all
diff --git a/transport/src/main/java/io/netty/channel/CompleteChannelPromise.java b/transport/src/main/java/io/netty/channel/CompleteChannelPromise.java
index b06da8e615..3a9d354458 100644
--- a/transport/src/main/java/io/netty/channel/CompleteChannelPromise.java
+++ b/transport/src/main/java/io/netty/channel/CompleteChannelPromise.java
@@ -23,7 +23,7 @@ abstract class CompleteChannelPromise extends CompleteChannelFuture implements C
     }
 
     @Override
-    public void setFailure(Throwable cause) {
+    public ChannelPromise setFailure(Throwable cause) {
         throw new IllegalStateException();
     }
 
@@ -33,7 +33,7 @@ abstract class CompleteChannelPromise extends CompleteChannelFuture implements C
     }
 
     @Override
-    public void setSuccess() {
+    public ChannelPromise setSuccess() {
         throw new IllegalStateException();
     }
 
diff --git a/transport/src/main/java/io/netty/channel/DefaultChannelPromise.java b/transport/src/main/java/io/netty/channel/DefaultChannelPromise.java
index a99b97c776..c97a075b9d 100644
--- a/transport/src/main/java/io/netty/channel/DefaultChannelPromise.java
+++ b/transport/src/main/java/io/netty/channel/DefaultChannelPromise.java
@@ -327,10 +327,10 @@ public class DefaultChannelPromise extends FlushCheckpoint implements ChannelPro
     }
 
     @Override
-    public void setSuccess() {
+    public ChannelPromise setSuccess() {
         if (success0()) {
             notifyListeners();
-            return;
+            return this;
         }
         throw new IllegalStateException();
     }
@@ -358,10 +358,10 @@ public class DefaultChannelPromise extends FlushCheckpoint implements ChannelPro
     }
 
     @Override
-    public void setFailure(Throwable cause) {
+    public ChannelPromise setFailure(Throwable cause) {
         if (failure0(cause)) {
             notifyListeners();
-            return;
+            return this;
         }
         throw new IllegalStateException();
     }
diff --git a/transport/src/main/java/io/netty/channel/VoidChannelPromise.java b/transport/src/main/java/io/netty/channel/VoidChannelPromise.java
index 9a7cdb189b..c24a8c5ab3 100644
--- a/transport/src/main/java/io/netty/channel/VoidChannelPromise.java
+++ b/transport/src/main/java/io/netty/channel/VoidChannelPromise.java
@@ -127,11 +127,13 @@ final class VoidChannelPromise implements ChannelFuture.Unsafe, ChannelPromise {
         return this;
     }
     @Override
-    public void setFailure(Throwable cause) {
+    public ChannelPromise setFailure(Throwable cause) {
+        return this;
     }
 
     @Override
-    public void setSuccess() {
+    public ChannelPromise setSuccess() {
+        return this;
     }
 
     @Override