diff --git a/SConstruct b/SConstruct
index 2c5b376982a..2b7e2aad929 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1189,7 +1189,7 @@ elif not onlyServer:
     coreShellFiles = [ "shell/dbshell.cpp" , "shell/shell_utils.cpp" , "shell/mongo-server.cpp" ]
 
     if not windows:
-        coreShellFiles.append( "third_party/linenoise/linenoise.c" )
+        coreShellFiles.append( "third_party/linenoise/linenoise.cpp" )
 
     if weird:
         shell32BitFiles = coreShellFiles
diff --git a/shell/dbshell.cpp b/shell/dbshell.cpp
index 6b9a99b9221..48275097f76 100644
--- a/shell/dbshell.cpp
+++ b/shell/dbshell.cpp
@@ -20,9 +20,8 @@
 
 #ifndef WIN32
 #define USE_LINENOISE
-extern "C" {
+
 #include "../third_party/linenoise/linenoise.h"
-}
 
 // this is for ctrl-c handling
 #include <setjmp.h>
diff --git a/third_party/linenoise/linenoise.c b/third_party/linenoise/linenoise.cpp
similarity index 100%
rename from third_party/linenoise/linenoise.c
rename to third_party/linenoise/linenoise.cpp