diff --git a/CHANGELOG.md b/CHANGELOG.md
index e5c2e05..b4ac555 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@ project adheres to [Semantic Versioning](http://semver.org/).
 
 ## master
 
+-  Rename encryption_method to signing_method [#53](https://github.com/doorkeeper-gem/doorkeeper-jwt/pull/53)
+
 ### Fixed
 
 - Fixed default token generation to return a random hex value [#56](https://github.com/doorkeeper-gem/doorkeeper-jwt/pull/56)
diff --git a/lib/doorkeeper/jwt/config.rb b/lib/doorkeeper/jwt/config.rb
index 41605ca..a11825b 100644
--- a/lib/doorkeeper/jwt/config.rb
+++ b/lib/doorkeeper/jwt/config.rb
@@ -42,6 +42,7 @@ def secret_key_path(value)
         # For backward compatibility. This library does not support encryption.
         def encryption_method(value)
           @config.instance_variable_set("@signing_method", value)
+          Kernel.warn("[DOORKEEPER-JWT]: Please use signing_method instead, this option is deprecated and will be removed soon")
         end
 
         def signing_method(value)