diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7e15360..729ed96 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,7 +15,7 @@ link_directories(${Boost_LIBRARY_DIRS})
 find_path(FF_INCLUDE_PATH fontforge/fontforge.h)
 if(FF_INCLUDE_PATH)
     message("Found fontforge.h: ${FF_INCLUDE_PATH}/fontforge/fontforge.h")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -include ${FF_INCLUDE_PATH}/fontforge/fontforge.h")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -include ${FF_INCLUDE_PATH}/fontforge/config.h")
     include_directories(${FF_INCLUDE_PATH}/fontforge)
 else()
     message(FATAL_ERROR "Error: cannot locate fontforge.h")
diff --git a/src/pdf2htmlEX.cc b/src/pdf2htmlEX.cc
index 1fbf2cf..8ef205a 100644
--- a/src/pdf2htmlEX.cc
+++ b/src/pdf2htmlEX.cc
@@ -65,7 +65,7 @@ po::variables_map parse_options (int argc, char **argv)
         ("user-password,u", po::value<string>(&param.user_password)->default_value(""), "user password (for encrypted files)")
 
         ("dest-dir", po::value<string>(&param.dest_dir)->default_value("."), "destination directory")
-        ("tmp-dir", po::value<string>(&param.tmp_dir)->default_value("/tmp/pdf2htmlEX"), "temporary directory")
+        ("tmp-dir", po::value<string>(&param.tmp_dir)->default_value((temp_directory_path() / "/pdf2htmlEX").string()), "temporary directory")
 
         ("first-page,f", po::value<int>(&param.first_page)->default_value(1), "first page to process")
         ("last-page,l", po::value<int>(&param.last_page)->default_value(numeric_limits<int>::max()), "last page to process")