diff --git a/distribution/src/site/content/grammar.html b/distribution/src/site/content/grammar.html
index c9e6006b8..f024fb421 100755
--- a/distribution/src/site/content/grammar.html
+++ b/distribution/src/site/content/grammar.html
@@ -52,11 +52,11 @@ <h2>EBNF</h2>
 ; It is followed by the lifecycle elements
 Lifecycle:= "Lifecycle:" LifecycleBefore? LifecycleAfter? Examples?
 
-; The before lifecyle element identified by keyword "Before:" (or equivalent in I18n-ed locale),
+; The before lifecycle element identified by keyword "Before:" (or equivalent in I18n-ed locale),
 ; followed by one or more steps
 LifecycleBefore:= "Before:" (Scope? Step+)+
 
-; The after lifecyle element identified by keyword "After:" (or equivalent in I18n-ed locale),
+; The after lifecycle element identified by keyword "After:" (or equivalent in I18n-ed locale),
 ; followed by one or more sets of scope, outcome, meta filter and steps
 LifecycleAfter:= "After:" (Scope? Outcome? MetaFilter? Step+)+
 
diff --git a/distribution/src/site/content/lifecycle.html b/distribution/src/site/content/lifecycle.html
index 0e8ca1560..e1b4121ef 100755
--- a/distribution/src/site/content/lifecycle.html
+++ b/distribution/src/site/content/lifecycle.html
@@ -8,7 +8,7 @@
 
 <h2>Lifecycle</h2>
 
-<p>JBehave supports two main ways to control the lifecyle of a story:</p>
+<p>JBehave supports two main ways to control the lifecycle of a story:</p>
 
 <ul>
     <li>Programmatically via <a href="annotations.html">annotations</a>.
diff --git a/jbehave-core/src/main/java/org/jbehave/core/parsers/grammar.ebnf b/jbehave-core/src/main/java/org/jbehave/core/parsers/grammar.ebnf
index c032d5a69..b17f35a68 100755
--- a/jbehave-core/src/main/java/org/jbehave/core/parsers/grammar.ebnf
+++ b/jbehave-core/src/main/java/org/jbehave/core/parsers/grammar.ebnf
@@ -40,11 +40,11 @@ GivenStories:= "GivenStories:" (StoryPath ','?)+ ;
 ; It is followed by the lifecycle elements
 Lifecycle:= "Lifecycle:" LifecycleBefore? LifecycleAfter? Examples?
 
-; The before lifecyle element identified by keyword "Before:" (or equivalent in I18n-ed locale), 
+; The before lifecycle element identified by keyword "Before:" (or equivalent in I18n-ed locale),
 ; followed by one or more steps
 LifecycleBefore:= "Before:" Step+
 
-; The after lifecyle element identified by keyword "After:" (or equivalent in I18n-ed locale), 
+; The after lifecycle element identified by keyword "After:" (or equivalent in I18n-ed locale),
 ; followed by one or more sets of outcome, meta filter and steps
 LifecycleAfter:= "After:" (Outcome? MetaFilter? Step+)+