diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c
index bd1d047d5c9fd051726a7d24f811610a7537436a..3c099fa00785e645efbbd2a447e3f8638be12ac6 100644
--- a/src/server/gdb_server.c
+++ b/src/server/gdb_server.c
@@ -53,7 +53,7 @@ static const char *DIGITS = "0123456789abcdef";
 static void gdb_log_callback(void *priv, const char *file, unsigned line,
 		const char *function, const char *string);
 
-/* number of gdb connections, mainly to supress gdb related debugging spam
+/* number of gdb connections, mainly to suppress gdb related debugging spam
  * in helper/log.c when no gdb connections are actually active */
 int gdb_actual_connections;
 
@@ -568,7 +568,7 @@ int gdb_get_packet_inner(struct connection *connection, char *buffer, int *len)
 					break;
 				case '+':
 					/* gdb sends a dummy ack '+' at every remote connect - see remote_start_remote (remote.c)
-					 * incase anyone tries to debug why they receive this warning every time */
+					 * in case anyone tries to debug why they receive this warning every time */
 					LOG_WARNING("acknowledgment received, but no packet pending");
 					break;
 				case '-':
@@ -859,7 +859,7 @@ static int gdb_reg_pos(struct target *target, int pos, int len)
  * register might be non-divisible by 8(a byte), in which
  * case an entire byte is shown.
  *
- * NB! the format on the wire is the target endianess
+ * NB! the format on the wire is the target endianness
  *
  * The format of reg->value is little endian
  *
@@ -2141,7 +2141,7 @@ int gdb_input_inner(struct connection *connection)
 							target_name(target));
 					break;
 				default:
-					/* ignore unkown packets */
+					/* ignore unknown packets */
 					LOG_DEBUG("ignoring 0x%2.2x packet", packet[0]);
 					gdb_put_packet(connection, NULL, 0);
 					break;
@@ -2320,7 +2320,7 @@ COMMAND_HANDLER(handle_gdb_breakpoint_override_command)
 		LOG_USER("force %s breakpoints", (gdb_breakpoint_override_type == BKPT_HARD)?"hard":"soft");
 	} else
 	{
-		LOG_USER("breakpoint type is not overriden");
+		LOG_USER("breakpoint type is not overridden");
 	}
 
 	return ERROR_OK;
diff --git a/src/server/httpd.c b/src/server/httpd.c
index 8c1d3dbaf440387841e6cfaf6c000a9cd44062eb..9fa58790f1f79db0fe5b769345a929a3da769c4e 100644
--- a/src/server/httpd.c
+++ b/src/server/httpd.c
@@ -207,7 +207,7 @@ static void request_completed(void *cls, struct MHD_Connection *connection,
 	*con_cls = NULL;
 }
 
-/* append to said key in dictonary */
+/* append to said key in dictionary */
 static void append_key(struct httpd_request *r, const char *key,
 		const char *data, size_t off, size_t size)
 {
@@ -388,7 +388,7 @@ static int ahc_echo_inner(void * cls, struct MHD_Connection * connection,
 		r->post = post;
 		Jim_SetVariableStr(interp, "httppostdata", Jim_NewDictObj(interp, NULL, 0));
 
-		/* fill in url query strings in dictonary */
+		/* fill in url query strings in dictionary */
 		MHD_get_connection_values(connection, MHD_GET_ARGUMENT_KIND,
 				record_arg, r);
 
diff --git a/src/server/server.c b/src/server/server.c
index 50bc00eb18bb606e1c27d450f3d646fbabeb2eea..3ba433e880ae8636e575a356eb1cb50a95922d61 100644
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -309,7 +309,7 @@ int server_loop(struct command_context *command_context)
 
 	while (!shutdown_openocd)
 	{
-		/* monitor sockets for acitvity */
+		/* monitor sockets for activity */
 		fd_max = 0;
 		FD_ZERO(&read_fds);