diff --git a/protoc-gen-psrpc/generator.go b/protoc-gen-psrpc/generator.go
index 802938b..68cb931 100644
--- a/protoc-gen-psrpc/generator.go
+++ b/protoc-gen-psrpc/generator.go
@@ -423,6 +423,9 @@ func (t *psrpc) generateInterface(file *descriptor.FileDescriptorProto, service
 		t.P()
 		t.P(`  // Close immediately, without waiting for pending RPCs`)
 		t.P(`  Kill()`)
+	} else if iface == client {
+		t.P(`  // Close immediately, without waiting for pending RPCs`)
+		t.P(`  Close()`)
 	}
 	t.P(`}`)
 }
@@ -554,6 +557,11 @@ func (t *psrpc) generateClient(service *descriptor.ServiceDescriptorProto) {
 		t.P(`}`)
 		t.P()
 	}
+
+	t.P(`func (s *`, structName, servTopics.FormatTypeParams(), `) Close() {`)
+	t.P(`  s.client.Close()`)
+	t.P(`}`)
+	t.P()
 }
 
 func (t *psrpc) generateServerImplSignature(method *descriptor.MethodDescriptorProto, opts *options.Options) {
diff --git a/version/version.go b/version/version.go
index 8984bc0..bb80fca 100644
--- a/version/version.go
+++ b/version/version.go
@@ -15,6 +15,6 @@
 package version
 
 const (
-	Version          = "v0.5.1"
-	PsrpcVersion_0_5 = true
+	Version          = "v0.6.0"
+	PsrpcVersion_0_6 = true
 )