diff --git a/ChangeLog b/ChangeLog
index 98da35a07..e0468e4e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -875,7 +875,7 @@ Changes in version 0.3.3.2-alpha - 2018-02-10
       would call the Rust implementation of
       protover_get_supported_protocols(). This was due to the C version
       returning a static string, whereas the Rust version newly allocated
-      a CString to pass accross the FFI boundary. Consequently, the C
+      a CString to pass across the FFI boundary. Consequently, the C
       code was not expecting to need to free() what it was given. Fixes
       bug 25127; bugfix on 0.3.2.1-alpha.
 
diff --git a/Makefile.am b/Makefile.am
index b892c69f7..cccad6c5e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -97,7 +97,7 @@ doxygen:
 test: all
 	$(top_builddir)/src/test/test
 
-check-local: check-spaces check-changes check-typos
+check-local: check-spaces check-changes
 
 need-chutney-path:
 	@if test ! -d "$$CHUTNEY_PATH"; then \
@@ -221,8 +221,8 @@ check-logs:
 check-typos:
 	@if test -x "`which misspell 2>&1;true`"; then \
 		echo "Checking for Typos ..."; \
-		(`which misspell` \
-			$(top_srcdir)/src/**/*.[ch] \
+		(misspell \
+			$(top_srcdir)/src/[^e]*/*.[ch] \
 			$(top_srcdir)/doc \
 			$(top_srcdir)/contrib \
 			$(top_srcdir)/scripts \
diff --git a/changes/ticket25024 b/changes/ticket25024
new file mode 100644
index 000000000..0ff22d092
--- /dev/null
+++ b/changes/ticket25024
@@ -0,0 +1,3 @@
+  o Minor features (code quality):
+    - Add spell checking using misspell in Makefile.
+      Closes ticket 25024.
diff --git a/src/common/crypto_rsa.h b/src/common/crypto_rsa.h
index 2f5442a5d..e95208931 100644
--- a/src/common/crypto_rsa.h
+++ b/src/common/crypto_rsa.h
@@ -35,7 +35,7 @@
 /** A public key, or a public/private key-pair. */
 typedef struct crypto_pk_t crypto_pk_t;
 
-/* RSA enviroment setup */
+/* RSA environment setup */
 MOCK_DECL(crypto_pk_t *,crypto_pk_new,(void));
 void crypto_pk_free_(crypto_pk_t *env);
 #define crypto_pk_free(pk) FREE_AND_NULL(crypto_pk_t, crypto_pk_free_, (pk))
diff --git a/src/or/protover.c b/src/or/protover.c
index 6532f09c2..18382ba7c 100644
--- a/src/or/protover.c
+++ b/src/or/protover.c
@@ -715,7 +715,7 @@ protover_all_supported(const char *s, char **missing_out)
             versions->high = i;
           }
           /* If the last one to be unsupported is one less than the current
-           * one, we're in a continous range, so set the high field. */
+           * one, we're in a continuous range, so set the high field. */
           if ((versions->high && versions->high == i - 1) ||
               /* Similarly, if the last high wasn't set and we're currently
                * one higher than the low, add current index as the highest