diff --git a/CMakeLists.txt b/CMakeLists.txt
index fc78d68..7ac8c1d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 2.8)
-project(Encfs)
+project(Encfs C CXX)
 
 set (ENCFS_MAJOR 2)
 set (ENCFS_MINOR 0)
diff --git a/cipher/botan.cpp b/cipher/botan.cpp
index 9a04b4b..177a53d 100644
--- a/cipher/botan.cpp
+++ b/cipher/botan.cpp
@@ -41,6 +41,7 @@
 #endif
 
 #include <string>
+#include <sstream>
 
 using namespace Botan;
 using std::string;
diff --git a/encfs/CMakeLists.txt b/encfs/CMakeLists.txt
index 458e52a..c01e5d9 100644
--- a/encfs/CMakeLists.txt
+++ b/encfs/CMakeLists.txt
@@ -18,6 +18,7 @@ target_link_libraries (encfs
     encfs-base
     ${GLOG_LIBRARIES}
     ${FUSE_LIBRARIES}
+    ${CMAKE_THREAD_LIBS_INIT}
 )
 
 if (POD2MAN)