diff --git a/src/main/java/org/springframework/retry/RetryContext.java b/src/main/java/org/springframework/retry/RetryContext.java
index 6ee4363a..0450ec5c 100644
--- a/src/main/java/org/springframework/retry/RetryContext.java
+++ b/src/main/java/org/springframework/retry/RetryContext.java
@@ -23,6 +23,7 @@
  * used to alter the course of the retry, e.g. force an early termination.
  *
  * @author Dave Syer
+ * @author Emanuele Ivaldi
  *
  */
 public interface RetryContext extends AttributeAccessor {
diff --git a/src/main/java/org/springframework/retry/RetryPolicy.java b/src/main/java/org/springframework/retry/RetryPolicy.java
index 0bd0fbd7..7185fd03 100644
--- a/src/main/java/org/springframework/retry/RetryPolicy.java
+++ b/src/main/java/org/springframework/retry/RetryPolicy.java
@@ -26,6 +26,7 @@
  * API for a range of different platforms for the external context.
  *
  * @author Dave Syer
+ * @author Emanuele Ivaldi
  *
  */
 public interface RetryPolicy extends Serializable {
diff --git a/src/main/java/org/springframework/retry/policy/CompositeRetryPolicy.java b/src/main/java/org/springframework/retry/policy/CompositeRetryPolicy.java
index e73d9ed6..6a97d15d 100644
--- a/src/main/java/org/springframework/retry/policy/CompositeRetryPolicy.java
+++ b/src/main/java/org/springframework/retry/policy/CompositeRetryPolicy.java
@@ -30,6 +30,7 @@
  *
  * @author Dave Syer
  * @author Michael Minella
+ * @author Emanuele Ivaldi
  *
  */
 @SuppressWarnings("serial")
diff --git a/src/main/java/org/springframework/retry/policy/SimpleRetryPolicy.java b/src/main/java/org/springframework/retry/policy/SimpleRetryPolicy.java
index 7bd8eb01..bede5057 100644
--- a/src/main/java/org/springframework/retry/policy/SimpleRetryPolicy.java
+++ b/src/main/java/org/springframework/retry/policy/SimpleRetryPolicy.java
@@ -58,6 +58,7 @@
  * @author Gary Russell
  * @author Aleksandr Shamukov
  * @author Artem Bilan
+ * @author Emanuele Ivaldi
  */
 @SuppressWarnings("serial")
 public class SimpleRetryPolicy implements RetryPolicy {
diff --git a/src/main/java/org/springframework/retry/support/RetryTemplate.java b/src/main/java/org/springframework/retry/support/RetryTemplate.java
index 8506b54d..ac715fec 100644
--- a/src/main/java/org/springframework/retry/support/RetryTemplate.java
+++ b/src/main/java/org/springframework/retry/support/RetryTemplate.java
@@ -75,6 +75,7 @@
  * @author Artem Bilan
  * @author Josh Long
  * @author Aleksandr Shamukov
+ * @author Emanuele Ivaldi
  */
 public class RetryTemplate implements RetryOperations {
 
diff --git a/src/test/java/org/springframework/retry/annotation/EnableRetryTests.java b/src/test/java/org/springframework/retry/annotation/EnableRetryTests.java
index 612eeca8..a8a3ad99 100644
--- a/src/test/java/org/springframework/retry/annotation/EnableRetryTests.java
+++ b/src/test/java/org/springframework/retry/annotation/EnableRetryTests.java
@@ -60,6 +60,7 @@
  * @author Henning Pöttker
  * @author Yanming Zhou
  * @author Anton Aharkau
+ * @author Emanuele Ivaldi
  * @since 1.1
  */
 public class EnableRetryTests {
diff --git a/src/test/java/org/springframework/retry/support/RetryTemplateTests.java b/src/test/java/org/springframework/retry/support/RetryTemplateTests.java
index 56dc9fb4..1828cb3e 100644
--- a/src/test/java/org/springframework/retry/support/RetryTemplateTests.java
+++ b/src/test/java/org/springframework/retry/support/RetryTemplateTests.java
@@ -51,6 +51,7 @@
  * @author Dave Syer
  * @author Gary Russell
  * @author Henning Pöttker
+ * @author Emanuele Ivaldi
  */
 public class RetryTemplateTests {