diff --git a/.codespell.ignore b/.codespell.ignore
new file mode 100644
index 00000000..550af5c3
--- /dev/null
+++ b/.codespell.ignore
@@ -0,0 +1,7 @@
+afile
+assertIn
+AtLeast
+AtMost
+fo
+SEH
+Seh
diff --git a/.codespellrc b/.codespellrc
new file mode 100644
index 00000000..f9d52512
--- /dev/null
+++ b/.codespellrc
@@ -0,0 +1,2 @@
+[codespell]
+ignore-words = .codespell.ignore
diff --git a/googlemock/src/gmock-internal-utils.cc b/googlemock/src/gmock-internal-utils.cc
index 96c7e306..86e9149e 100644
--- a/googlemock/src/gmock-internal-utils.cc
+++ b/googlemock/src/gmock-internal-utils.cc
@@ -162,7 +162,7 @@ GTEST_API_ void Log(LogSeverity severity, const std::string& message,
     // Prints a GMOCK WARNING marker to make the warnings easily searchable.
     std::cout << "\nGMOCK WARNING:";
   }
-  // Pre-pends a new-line to message if it doesn't start with one.
+  // Prepends a new-line to message if it doesn't start with one.
   if (message.empty() || message[0] != '\n') {
     std::cout << "\n";
   }
diff --git a/googletest/include/gtest/gtest-printers.h b/googletest/include/gtest/gtest-printers.h
index b2822bcd..196265a6 100644
--- a/googletest/include/gtest/gtest-printers.h
+++ b/googletest/include/gtest/gtest-printers.h
@@ -1142,7 +1142,7 @@ void UniversalTersePrint(const T& value, ::std::ostream* os) {
 // NUL-terminated string.
 template <typename T>
 void UniversalPrint(const T& value, ::std::ostream* os) {
-  // A workarond for the bug in VC++ 7.1 that prevents us from instantiating
+  // A workaround for the bug in VC++ 7.1 that prevents us from instantiating
   // UniversalPrinter with T directly.
   typedef T T1;
   UniversalPrinter<T1>::Print(value, os);
diff --git a/googletest/include/gtest/internal/gtest-param-util.h b/googletest/include/gtest/internal/gtest-param-util.h
index cc7ea531..3a85e58d 100644
--- a/googletest/include/gtest/internal/gtest-param-util.h
+++ b/googletest/include/gtest/internal/gtest-param-util.h
@@ -760,7 +760,7 @@ class ParameterizedTestSuiteRegistry {
 };
 
 // Keep track of what type-parameterized test suite are defined and
-// where as well as which are intatiated. This allows susequently
+// where as well as which are intatiated. This allows subsequently
 // identifying suits that are defined but never used.
 class TypeParameterizedTestSuiteRegistry {
  public:
diff --git a/googletest/src/gtest-port.cc b/googletest/src/gtest-port.cc
index 1038ad7b..40f05faf 100644
--- a/googletest/src/gtest-port.cc
+++ b/googletest/src/gtest-port.cc
@@ -712,7 +712,7 @@ bool RE::PartialMatch(const char* str, const RE& re) {
 void RE::Init(const char* regex) {
   pattern_ = regex;
 
-  // NetBSD (and Android, which takes its regex implemntation from NetBSD) does
+  // NetBSD (and Android, which takes its regex implementation from NetBSD) does
   // not include the GNU regex extensions (such as Perl style character classes
   // like \w) in REG_EXTENDED. REG_EXTENDED is only specified to include the
   // [[:alpha:]] style character classes. Enable REG_GNU wherever it is defined