diff --git a/ChangeLog b/ChangeLog
index 3240e8f3..6e00364b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -90,7 +90,7 @@ Borreli, blotus:
    * [c8c7b0b,23bbc60] Better logging of log file read errors.
    * [3665e6d] Added code coverage to development process.
    * [41b9f7b,32d10e9] More complete ssh filter rules to match openssh source.
-   * [1d9abd1] Action files can have tags in defination that refer to other
+   * [1d9abd1] Action files can have tags in definition that refer to other
      tags.
   Pascal Borreli
    * [a2b29b4] Fixed lots of typos in config files and documentation.
diff --git a/server/action.py b/server/action.py
index 3221f150..22a96fa2 100644
--- a/server/action.py
+++ b/server/action.py
@@ -246,13 +246,13 @@ class Action:
 		return Action.executeCmd(stopCmd)
 
 	##
-	# Sort out tag definations within other tags
+	# Sort out tag definitions within other tags
 	#
 	# so:		becomes:
 	# a = 3		a = 3
 	# b = <a>_3	b = 3_3
 	# @param	tags, a dictionary
-	# @returns	tags altered or False if there is a recursive defination
+	# @returns	tags altered or False if there is a recursive definition
 	#@staticmethod
 	def substituteRecursiveTags(tags):
 		t = re.compile(r'<([^ >]+)>')
@@ -261,7 +261,7 @@ class Action:
 			m = t.search(value)
 			while m:
 				if m.group(1) == tag:
-					# recursive definations are bad
+					# recursive definitions are bad
 					return False
 				else:
 					if tags.has_key(m.group(1)):