diff --git a/Setup.hs b/Setup.hs
--- a/Setup.hs
+++ b/Setup.hs
@@ -1,78 +1,2 @@
-import Distribution.PackageDescription
 import Distribution.Simple
-import Distribution.Simple.LocalBuildInfo
-import Distribution.Simple.UserHooks
-import Distribution.Simple.Setup
-
-import System.Info
-import System.Directory
-import System.Environment
-import System.Process
-import System.FilePath
-
-import Data.Maybe
-
-main = defaultMainWithHooks simpleUserHooks { confHook = odenConfHook
-                                            , postConf = odenPostConf }
-
-addLibDirsToBuildInfo :: BuildInfo -> IO BuildInfo
-addLibDirsToBuildInfo buildInfo = do
-  wd <- getCurrentDirectory
-  return $ buildInfo {
-    extraLibDirs = wd : extraLibDirs buildInfo
-  }
-
-addLibDirsToOdenExe :: [Executable] -> IO [Executable]
-addLibDirsToOdenExe = mapM addIfOden
-  where
-  addIfOden exe
-    | exeName exe == "oden-exe" = do
-      withLibDirs <- addLibDirsToBuildInfo (buildInfo exe)
-      return $ exe { buildInfo = withLibDirs }
-    | otherwise = return exe
-
-addLibDirsToTests :: [TestSuite] -> IO [TestSuite]
-addLibDirsToTests = mapM addLibDirs
-  where
-  addLibDirs suite = do
-    withLibDirs <- addLibDirsToBuildInfo (testBuildInfo suite)
-    return $ suite { testBuildInfo = withLibDirs }
-
-odenConfHook :: (GenericPackageDescription, HookedBuildInfo)
-             -> ConfigFlags
-             -> IO LocalBuildInfo
-odenConfHook (description, buildInfo) flags = do
-  localBuildInfo <- confHook simpleUserHooks (description, buildInfo) flags
-  let packageDescription = localPkgDescr localBuildInfo
-      lib = fromJust $ library packageDescription
-
-  libWithLibDirs <- addLibDirsToBuildInfo (libBuildInfo lib)
-  executablesWithLibDirs <- addLibDirsToOdenExe (executables packageDescription)
-  testSuitesWithLibDirs <- addLibDirsToTests (testSuites packageDescription)
-
-  return $ localBuildInfo {
-    localPkgDescr = packageDescription {
-      library = Just $ lib {
-        libBuildInfo = libWithLibDirs
-      },
-      executables = executablesWithLibDirs,
-      testSuites = testSuitesWithLibDirs
-    }
-  }
-
-ext :: String
-ext = case os of
-  "darwin"  -> ".dylib"
-  "windows" -> ".dll"
-  _         -> ".so"
-
-odenPostConf :: Args -> ConfigFlags -> PackageDescription -> LocalBuildInfo -> IO ()
-odenPostConf _ _ _ _ = do
-  wd <- getCurrentDirectory
-  setEnv "GOPATH" (wd </> "go")
-
-  let dynamicPath = wd </> ("libimporter" ++ ext)
-      buildDynamic = shell ("go build -buildmode=c-shared -o " ++ dynamicPath ++ " oden/cmd/importer")
-
-  putStrLn $ "Compiling Go dynamic library to " ++ dynamicPath
-  readCreateProcess buildDynamic "" >>= putStr
+main = defaultMain
diff --git a/pandoc-emphasize-code.cabal b/pandoc-emphasize-code.cabal
--- a/pandoc-emphasize-code.cabal
+++ b/pandoc-emphasize-code.cabal
@@ -5,7 +5,7 @@
 author:              Oskar Wickström
 maintainer:          Oskar Wickström
 homepage:	           https://github.com/owickstrom/pandoc-emphasize-code
-version:             0.2.1
+version:             0.2.2
 cabal-version:       >= 1.8
 build-type:          Simple
 category:            Documentation
diff --git a/src/Text/Pandoc/Filter/EmphasizeCode/Html.hs b/src/Text/Pandoc/Filter/EmphasizeCode/Html.hs
--- a/src/Text/Pandoc/Filter/EmphasizeCode/Html.hs
+++ b/src/Text/Pandoc/Filter/EmphasizeCode/Html.hs
@@ -44,5 +44,5 @@
         Html.code_ $
         mconcat
           (intersperse
-             (Html.br_ [])
+             (Html.toHtmlRaw "\n")
              (map (foldMap (emphasizeChunkHtml tag)) lines'))
diff --git a/test/Text/Pandoc/Filter/EmphasizeCodeTest.hs b/test/Text/Pandoc/Filter/EmphasizeCodeTest.hs
--- a/test/Text/Pandoc/Filter/EmphasizeCodeTest.hs
+++ b/test/Text/Pandoc/Filter/EmphasizeCodeTest.hs
@@ -13,9 +13,9 @@
   RawBlock
     "html"
     (mconcat
-       [ "<pre class=\"my-lang\"><code>hello world<br>"
-       , "hej <mark>världen</mark><br>"
-       , "<mark>hallo</mark> welt<br>"
+       [ "<pre class=\"my-lang\"><code>hello world\n"
+       , "hej <mark>världen</mark>\n"
+       , "<mark>hallo</mark> welt\n"
        , "hei verden</code></pre>"
        ])
 
@@ -24,9 +24,9 @@
   RawBlock
     "html"
     (mconcat
-       [ "<pre class=\"my-lang\"><code>hello world<br>"
-       , "hej <em>världen</em><br>"
-       , "<em>hallo</em> welt<br>"
+       [ "<pre class=\"my-lang\"><code>hello world\n"
+       , "hej <em>världen</em>\n"
+       , "<em>hallo</em> welt\n"
        , "hei verden</code></pre>"
        ])
 
@@ -46,9 +46,9 @@
     RawBlock
       "html"
       (mconcat
-         [ "<pre class=\"my-lang\"><code>hello world<br>"
-         , "hej <mark>världen</mark><br>"
-         , "<mark>hallo welt</mark><br>"
+         [ "<pre class=\"my-lang\"><code>hello world\n"
+         , "hej <mark>världen</mark>\n"
+         , "<mark>hallo welt</mark>\n"
          , "<mark>hei</mark> verden</code></pre>"
          ])
   it "emphasizes HTML and multiple ranges" $
@@ -56,9 +56,9 @@
     RawBlock
       "html"
       (mconcat
-         [ "<pre class=\"my-lang\"><code><mark>hello</mark> world<br>"
-         , "hej <mark>världen</mark><br>"
-         , "<mark>hallo</mark> welt<br>"
+         [ "<pre class=\"my-lang\"><code><mark>hello</mark> world\n"
+         , "hej <mark>världen</mark>\n"
+         , "<mark>hallo</mark> welt\n"
          , "hei verden</code></pre>"
          ])
   it "emphasizes RevealJS HTML using <mark>" $