diff --git a/Setup.hs b/Setup.hs
deleted file mode 100644
--- a/Setup.hs
+++ /dev/null
@@ -1,2 +0,0 @@
-import Distribution.Simple
-main = defaultMain
diff --git a/inline-c-cpp.cabal b/inline-c-cpp.cabal
--- a/inline-c-cpp.cabal
+++ b/inline-c-cpp.cabal
@@ -1,5 +1,5 @@
 name:                inline-c-cpp
-version:             0.1.0.0
+version:             0.2.0.0
 synopsis:            Lets you embed C++ code into Haskell.
 description:         Utilities to inline C++ code into Haskell using inline-c.  See
                      tests for example on how to build.
@@ -7,7 +7,7 @@
 license-file:        LICENSE
 author:              Francesco Mazzoli
 maintainer:          francesco@fpcomplete.com
-copyright:           (c) 2015 FP Complete Corporation
+copyright:           (c) 2015-2016 FP Complete Corporation, (c) 2017 Francesco Mazzoli
 category:            FFI
 tested-with:         GHC == 7.8.4, GHC == 7.10.1
 build-type:          Simple
@@ -30,7 +30,6 @@
   type:                exitcode-stdio-1.0
   hs-source-dirs:      test
   main-is:             tests.hs
-  c-sources:           test/tests.cpp
   build-depends:       base >=4 && <5
                      , inline-c-cpp
   default-language:    Haskell2010
diff --git a/src/Language/C/Inline/Cpp.hs b/src/Language/C/Inline/Cpp.hs
--- a/src/Language/C/Inline/Cpp.hs
+++ b/src/Language/C/Inline/Cpp.hs
@@ -9,6 +9,7 @@
 
 import           Data.Monoid ((<>), mempty)
 import qualified Language.Haskell.TH as TH
+import qualified Language.Haskell.TH.Syntax as TH
 
 import           Language.C.Inline
 import           Language.C.Inline.Context
@@ -19,7 +20,7 @@
 -- build.
 cppCtx :: Context
 cppCtx = baseCtx <> mempty
-  { ctxFileExtension = Just "cpp"
+  { ctxForeignSrcLang = Just TH.LangCxx
   , ctxOutput = Just $ \s -> "extern \"C\" {\n" ++ s ++ "\n}"
   }
 
diff --git a/test/tests.cpp b/test/tests.cpp
deleted file mode 100644
--- a/test/tests.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-
-#include <iostream>
-
-extern "C" {
-void inline_c_0_e9878d13a3494fc92f462122a4f7dd84b38a6a80(int x_inline_c_0) {
-
-      std::cout << "Hello, world!" << x_inline_c_0 << std::endl;
-    
-}
-
-}