diff --git a/FileLister.cpp b/FileLister.cpp
index 5994b8928..dc93b188d 100644
--- a/FileLister.cpp
+++ b/FileLister.cpp
@@ -38,7 +38,8 @@ bool FileLister::AcceptFile( const std::string &filename )
 
     std::string extension = filename.substr( dotLocation );
 
-    if( extension == ".cpp" ||
+    if( extension == ".cpp" ||
+        extension == ".cxx" ||
         extension == ".cc" ||
         extension == ".c" )
     {
@@ -126,7 +127,8 @@ void FileLister::RecursiveAddFiles( std::vector<std::string> &filenames, const s
         return;
     }
 
-    AddFiles( filenames, path, "*.cpp" );
+    AddFiles( filenames, path, "*.cpp" );
+    AddFiles( filenames, path, "*.cxx" );
     AddFiles( filenames, path, "*.cc" );
     AddFiles( filenames, path, "*.c" );
 
diff --git a/cppcheck.cpp b/cppcheck.cpp
index cd32bbd63..ed93a5845 100644
--- a/cppcheck.cpp
+++ b/cppcheck.cpp
@@ -130,7 +130,7 @@ std::string CppCheck::parseFromArgs( int argc, char* argv[] )
                  "\n"
                  "    --style         Check coding style.\n"
                  "    --errorsonly    Only print something when there is an error\n"
-                 "    --recursive     Recursively check all *.cpp, *.cc and *.c files\n";
+                 "    --recursive     Recursively check all *.cpp, *.cxx, *.cc and *.c files\n";
         return oss.str();
     }
 
diff --git a/man/cppcheck.1.xml b/man/cppcheck.1.xml
index efadcce6c..836f7c6e0 100644
--- a/man/cppcheck.1.xml
+++ b/man/cppcheck.1.xml
@@ -140,7 +140,7 @@ man(1), man(7), http://www.tldp.org/HOWTO/Man-Page/
       <varlistentry>
         <term><option>--recursive</option></term>
         <listitem>
-          <para>Recursively check all *.cpp, *.cc and *.c files.</para>
+          <para>Recursively check all *.cpp, *.cxx, *.cc and *.c files.</para>
         </listitem>
       </varlistentry>
       <varlistentry>