diff --git a/build.gradle b/build.gradle
index 66c9b0c2..811001d1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -295,12 +295,8 @@ configure(rootProject) {
 		from('src/dist') {
 			include 'changelog.txt'
 		}
-		// disable api for jdk8 because we have
-		// some trouble with javadocs
-		if (!JavaVersion.current().isJava8Compatible()) {
-			from (api) {
-				into 'api'
-			}
+		from (api) {
+			into 'api'
 		}
 		from (reference) {
 			into 'reference'
diff --git a/spring-statemachine-core/src/main/java/org/springframework/statemachine/ExtendedState.java b/spring-statemachine-core/src/main/java/org/springframework/statemachine/ExtendedState.java
index b1bfe0d9..c10edf93 100644
--- a/spring-statemachine-core/src/main/java/org/springframework/statemachine/ExtendedState.java
+++ b/spring-statemachine-core/src/main/java/org/springframework/statemachine/ExtendedState.java
@@ -37,6 +37,7 @@ public interface ExtendedState {
 	/**
 	 * Gets a variable which is automatically casted into a type.
 	 *
+	 * @param <T> the return type
 	 * @param key the variable key
 	 * @param type the variable type
 	 * @return the variable
diff --git a/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/configurers/ConfigurationConfigurer.java b/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/configurers/ConfigurationConfigurer.java
index c39af0d6..2f1ac309 100644
--- a/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/configurers/ConfigurationConfigurer.java
+++ b/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/configurers/ConfigurationConfigurer.java
@@ -44,7 +44,7 @@ public interface ConfigurationConfigurer<S, E> extends
 	/**
 	 * Specify a {@link TaskExecutor}.
 	 *
-	 * @param beanFactory the bean factory
+	 * @param taskExecutor the task executor
 	 * @return configurer for chaining
 	 */
 	ConfigurationConfigurer<S, E> taskExecutor(TaskExecutor taskExecutor);
@@ -52,7 +52,7 @@ public interface ConfigurationConfigurer<S, E> extends
 	/**
 	 * Specify a {@link TaskScheduler}.
 	 *
-	 * @param beanFactory the bean factory
+	 * @param taskScheduler the task scheduler
 	 * @return configurer for chaining
 	 */
 	ConfigurationConfigurer<S, E> taskScheduler(TaskScheduler taskScheduler);
diff --git a/spring-statemachine-core/src/main/java/org/springframework/statemachine/event/OnStateChangedEvent.java b/spring-statemachine-core/src/main/java/org/springframework/statemachine/event/OnStateChangedEvent.java
index 65ce86be..5066ec3a 100644
--- a/spring-statemachine-core/src/main/java/org/springframework/statemachine/event/OnStateChangedEvent.java
+++ b/spring-statemachine-core/src/main/java/org/springframework/statemachine/event/OnStateChangedEvent.java
@@ -33,6 +33,8 @@ public class OnStateChangedEvent extends StateMachineEvent {
 	 * Instantiates a new on state changed event.
 	 *
 	 * @param source the component that published the event (never {@code null})
+	 * @param sourceState the source state
+	 * @param targetState the target state
 	 */
 	public OnStateChangedEvent(Object source, State<?, ?> sourceState, State<?, ?> targetState) {
 		super(source);
diff --git a/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/AbstractStateMachine.java b/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/AbstractStateMachine.java
index 74e42a84..c1fb4f06 100644
--- a/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/AbstractStateMachine.java
+++ b/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/AbstractStateMachine.java
@@ -143,6 +143,7 @@ public abstract class AbstractStateMachine<S, E> extends StateMachineObjectSuppo
 	 * @param states the states of this machine
 	 * @param transitions the transitions of this machine
 	 * @param initialState the initial state of this machine
+	 * @param initialTransition the initial transition
 	 * @param initialEvent the initial event of this machine
 	 * @param extendedState the extended state of this machine
 	 */
diff --git a/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/DefaultStateMachineExecutor.java b/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/DefaultStateMachineExecutor.java
index 171a1320..0ca8b188 100644
--- a/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/DefaultStateMachineExecutor.java
+++ b/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/DefaultStateMachineExecutor.java
@@ -99,6 +99,8 @@ public class DefaultStateMachineExecutor<S, E> extends LifecycleObjectSupport im
 	 * @param transitions the transitions
 	 * @param triggerToTransitionMap the trigger to transition map
 	 * @param triggerlessTransitions the triggerless transitions
+	 * @param initialTransition the initial transition
+	 * @param initialEvent the initial event
 	 */
 	public DefaultStateMachineExecutor(StateMachine<S, E> stateMachine, StateMachine<S, E> relayStateMachine,
 			ExtendedState extendedState, Collection<Transition<S, E>> transitions, Map<Trigger<S, E>, Transition<S, E>> triggerToTransitionMap,
diff --git a/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/StateMachineUtils.java b/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/StateMachineUtils.java
index b3061cdb..e1d59e30 100644
--- a/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/StateMachineUtils.java
+++ b/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/StateMachineUtils.java
@@ -32,6 +32,8 @@ public abstract class StateMachineUtils {
 	/**
 	 * Checks if right hand side is a substate of a left hand side.
 	 *
+	 * @param <S> the type of state
+	 * @param <E> the type of event
 	 * @param left the super state
 	 * @param right the sub state
 	 * @return if sub is child of super
diff --git a/spring-statemachine-recipes/src/main/java/org/springframework/statemachine/recipes/persist/PersistStateMachineHandler.java b/spring-statemachine-recipes/src/main/java/org/springframework/statemachine/recipes/persist/PersistStateMachineHandler.java
index 59ef6575..2791bf79 100644
--- a/spring-statemachine-recipes/src/main/java/org/springframework/statemachine/recipes/persist/PersistStateMachineHandler.java
+++ b/spring-statemachine-recipes/src/main/java/org/springframework/statemachine/recipes/persist/PersistStateMachineHandler.java
@@ -94,7 +94,7 @@ public class PersistStateMachineHandler extends LifecycleObjectSupport {
 	 * The class that is interested in processing a persistStateChange
 	 * event implements this interface, and the object created
 	 * with that class is registered with a component using the
-	 * component's <code>addPersistStateChangeListener<code> method. When
+	 * component's <code>addPersistStateChangeListener</code> method. When
 	 * the persistStateChange event occurs, that object's appropriate
 	 * method is invoked.
 	 */
diff --git a/spring-statemachine-test/src/main/java/org/springframework/statemachine/test/StateMachineTestPlanBuilder.java b/spring-statemachine-test/src/main/java/org/springframework/statemachine/test/StateMachineTestPlanBuilder.java
index b44a5072..280d2129 100644
--- a/spring-statemachine-test/src/main/java/org/springframework/statemachine/test/StateMachineTestPlanBuilder.java
+++ b/spring-statemachine-test/src/main/java/org/springframework/statemachine/test/StateMachineTestPlanBuilder.java
@@ -41,6 +41,8 @@ public class StateMachineTestPlanBuilder<S, E> {
 	/**
 	 * Gets a new instance of this builder.
 	 *
+	 * @param <S> the type of state
+	 * @param <E> the type of event
 	 * @return the state machine test plan builder
 	 */
 	public static <S, E> StateMachineTestPlanBuilder<S, E> builder() {