diff --git a/HISTORY.md b/HISTORY.md
index b7ccdd3..f879f2d 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -26,6 +26,7 @@ I tried to give credit whenever possible. If I have missed anyone, kindly add it
 - Tweak: Remove $(EXTRA_XXX) variables (Issue #234) (https://github.com/ladislas)
 - Tweak: Moved location of avrdude for 1.5.8 on Linux (Issue #301) (https://github.com/sej7278)
 - Tweak: Allow 'build.core' param as found in [arduino-tiny](https://code.google.com/p/arduino-tiny/) Prospective Boards.txt. (https://github.com/Gaboose)
+- Tweak: Replace CXX_NAME with CXX as per the Emacs Flymake Wiki (Issue #309) (https://github.com/sej7278)
 
 - Fix: Improved Windows (Cygwin/MSYS) support (https://github.com/PeterMosmans)
 - Fix: Change "tinyladi" username to "ladislas" in HISTORY.md. (https://github.com/ladislas)
diff --git a/README.md b/README.md
index 7f017b0..0d3477f 100644
--- a/README.md
+++ b/README.md
@@ -259,7 +259,7 @@ Then, the following line must be added to the project Makefile :
 
 ```
     check-syntax:
-        $(CXX_NAME) -c -include Arduino.h   -x c++ $(CXXFLAGS)   $(CPPFLAGS)  -fsyntax-only $(CHK_SOURCES)
+        $(CXX) -c -include Arduino.h   -x c++ $(CXXFLAGS)   $(CPPFLAGS)  -fsyntax-only $(CHK_SOURCES)
 ```
 
 ## Test Suite