diff --git a/lib/asn1/gen_copy.c b/lib/asn1/gen_copy.c
index 3f71e00ba..cc9a9a32f 100644
--- a/lib/asn1/gen_copy.c
+++ b/lib/asn1/gen_copy.c
@@ -62,6 +62,7 @@ copy_type (const char *from, const char *to, const Type *t, int preserve)
 	    copy_primitive ("heim_integer", from, to);
 	    break;
 	}
+        /* FALLTHROUGH */
     case TBoolean:
     case TEnumerated :
 	fprintf(codefile, "*(%s) = *(%s);\n", to, from);
diff --git a/lib/hx509/cert.c b/lib/hx509/cert.c
index 3cb364445..f81542eef 100644
--- a/lib/hx509/cert.c
+++ b/lib/hx509/cert.c
@@ -2378,9 +2378,10 @@ hx509_verify_path(hx509_context context,
 		 * EE checking below.
 		 */
 		type = EE_CERT;
-		/* FALLTHOUGH */
+                /* FALLTHROUGH */
 	    }
 	}
+        /* FALLTHROUGH */
 	case EE_CERT:
 	    /*
 	     * If there where any proxy certificates in the chain
diff --git a/lib/hx509/file.c b/lib/hx509/file.c
index c2478ff35..1b5ca3eae 100644
--- a/lib/hx509/file.c
+++ b/lib/hx509/file.c
@@ -230,7 +230,7 @@ hx509_pem_read(hx509_context context,
 		where = INDATA;
 		goto indata;
 	    }
-	    /* FALLTHOUGH */
+	    /* FALLTHROUGH */
 	case INHEADER:
 	    if (buf[0] == '\0') {
 		where = INDATA;
diff --git a/lib/wind/utf8.c b/lib/wind/utf8.c
index e1a1eb7b2..d69db0c0c 100644
--- a/lib/wind/utf8.c
+++ b/lib/wind/utf8.c
@@ -205,14 +205,18 @@ wind_ucs4utf8(const uint32_t *in, size_t in_len, char *out, size_t *out_len)
 	    case 4:
 		out[3] = (ch | 0x80) & 0xbf;
 		ch = ch >> 6;
+                /* FALLTHROUGH */
 	    case 3:
 		out[2] = (ch | 0x80) & 0xbf;
 		ch = ch >> 6;
+                /* FALLTHROUGH */
 	    case 2:
 		out[1] = (ch | 0x80) & 0xbf;
 		ch = ch >> 6;
+                /* FALLTHROUGH */
 	    case 1:
 		out[0] = ch | first_char[len - 1];
+                /* FALLTHROUGH */
 	    }
 	}
 	out += len;
@@ -480,11 +484,14 @@ wind_ucs2utf8(const uint16_t *in, size_t in_len, char *out, size_t *out_len)
 	    case 3:
 		out[2] = (ch | 0x80) & 0xbf;
 		ch = ch >> 6;
+                /* FALLTHROUGH */
 	    case 2:
 		out[1] = (ch | 0x80) & 0xbf;
 		ch = ch >> 6;
+                /* FALLTHROUGH */
 	    case 1:
 		out[0] = ch | first_char[len - 1];
+                /* FALLTHROUGH */
 	    }
 	    out += len;
 	}