diff --git a/ChangeLog b/ChangeLog
index 4f64110a..2b9e9b71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2013-08-06  Nicolas François  <nicolas.francois@centraliens.net>
+
+	* man/login.defs.d/SUB_GID_COUNT.xml: Fix typo.
+	* man/login.defs.d/SUB_UID_COUNT.xml: Likewise.
+	* man/login.defs.d/SUB_UID_COUNT.xml: Fix copy-paste issue from
+	SUB_GID_COUNT.
+	* man/newgidmap.1.xml: Fix Typo.
+	* src/useradd.c: Fix typos.
+	* lib/subordinateio.c: Fix typos.
+
 2013-08-06  Nicolas François  <nicolas.francois@centraliens.net>
 
 	Fix Debian bug #675824
diff --git a/lib/subordinateio.c b/lib/subordinateio.c
index 4cca9925..051fb9f1 100644
--- a/lib/subordinateio.c
+++ b/lib/subordinateio.c
@@ -231,7 +231,7 @@ static unsigned long find_free_range(struct commonio_db *db,
 	if ((count == 0) || (max <= min))
 		goto fail;
 
-	/* Sort by range than by owner */
+	/* Sort by range then by owner */
 	commonio_sort (db, subordinate_range_cmp);
 	commonio_rewind(db);
 
@@ -275,7 +275,7 @@ static int add_range(struct commonio_db *db,
 	if (have_range(db, owner, start, count))
 		return 1;
 
-	/* Oterwise append the range */
+	/* Otherwise append the range */
 	return commonio_append(db, &range);
 }
 
diff --git a/man/login.defs.d/SUB_GID_COUNT.xml b/man/login.defs.d/SUB_GID_COUNT.xml
index db1a25b0..067d6196 100644
--- a/man/login.defs.d/SUB_GID_COUNT.xml
+++ b/man/login.defs.d/SUB_GID_COUNT.xml
@@ -38,7 +38,7 @@
       new user.
     </para>
     <para>
-      The default values for <option>SUB_GID_MAN</option>,
+      The default values for <option>SUB_GID_MAX</option>,
       <option>SUB_GID_MIN</option>, <option>SUB_GID_COUNT</option>
       are respectively 100000, 600100000 and 10000.
     </para>
diff --git a/man/login.defs.d/SUB_UID_COUNT.xml b/man/login.defs.d/SUB_UID_COUNT.xml
index bea3b6a1..82595d35 100644
--- a/man/login.defs.d/SUB_UID_COUNT.xml
+++ b/man/login.defs.d/SUB_UID_COUNT.xml
@@ -38,8 +38,8 @@
       new user.
     </para>
     <para>
-      The default values for <option>SUB_GID_MAN</option>,
-      <option>SUB_GID_MIN</option>, <option>SUB_GID_COUNT</option>
+      The default values for <option>SUB_UID_MAX</option>,
+      <option>SUB_UID_MIN</option>, <option>SUB_UID_COUNT</option>
       are respectively 100000, 600100000 and 10000.
     </para>
   </listitem>
diff --git a/man/newgidmap.1.xml b/man/newgidmap.1.xml
index 424a480c..ac4d99bd 100644
--- a/man/newgidmap.1.xml
+++ b/man/newgidmap.1.xml
@@ -119,7 +119,7 @@
       <varlistentry>
 	<term><filename>/etc/subgid</filename></term>
 	<listitem>
-	  <para>List of users subordinate user IDs.</para>
+	  <para>List of users subordinate group IDs.</para>
 	</listitem>
       </varlistentry>
       <varlistentry>
diff --git a/src/useradd.c b/src/useradd.c
index 70bac952..546a5c2a 100644
--- a/src/useradd.c
+++ b/src/useradd.c
@@ -285,7 +285,7 @@ static void fail_exit (int code)
 			SYSLOG ((LOG_ERR, "failed to unlock %s", sub_uid_dbname ()));
 #ifdef WITH_AUDIT
 			audit_logger (AUDIT_ADD_USER, Prog,
-			              "unlocking subodinate user file",
+			              "unlocking subordinate user file",
 			              user_name, AUDIT_NO_ID,
 			              SHADOW_AUDIT_FAILURE);
 #endif
@@ -298,7 +298,7 @@ static void fail_exit (int code)
 			SYSLOG ((LOG_ERR, "failed to unlock %s", sub_gid_dbname ()));
 #ifdef WITH_AUDIT
 			audit_logger (AUDIT_ADD_USER, Prog,
-			              "unlocking subodinate group file",
+			              "unlocking subordinate group file",
 			              user_name, AUDIT_NO_ID,
 			              SHADOW_AUDIT_FAILURE);
 #endif