diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1ca27957..d11c5d2f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,8 +1,8 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.3)
 # SET(CMAKE_CXX_COMPILER "clang++")
 # SET(CMAKE_C_COMPILER "clang")
-SET(CMAKE_CC_FLAGS " ")
-SET(CMAKE_CXX_FLAGS "-std=c++0x -D_REENTRANT -Wall -Wno-sign-compare -fstack-protector -fPIC")
+SET(CMAKE_CC_FLAGS "${CMAKE_CC_FLAGS} ")
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -D_REENTRANT -Wall -Wno-sign-compare -fstack-protector -fPIC")
 SET(CMAKE_CXX_FLAGS_RELEASE " -O2 -g -DNDEBUG")
 SET(CMAKE_CXX_FLAGS_DEBUG "-g")
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,-E -Wl,-Bsymbolic -rdynamic -L.")
diff --git a/ext/URI-Escape/CMakeLists.txt b/ext/URI-Escape/CMakeLists.txt
index 2555ee7a..e2e74489 100644
--- a/ext/URI-Escape/CMakeLists.txt
+++ b/ext/URI-Escape/CMakeLists.txt
@@ -1,15 +1,16 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
-SET(CMAKE_CXX_FLAGS "-std=c++0x")
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -Wall -Wno-sign-compare -fstack-protector -fPIC")
 SET(CMAKE_CXX_FLAGS_RELEASE "-Wall -Wno-sign-compare -fstack-protector -fPIC -O2 -g")
 SET(CMAKE_CXX_FLAGS_DEBUG "-g")
-SET(CMAKE_LINK_FLAGS "-Wl,-E' '-Wl,-Bsymbolic' '-rdynamic")
+SET(CMAKE_MODULE_LINKER_FLAGS "-Wl,-E -Wl,-Bsymbolic -rdynamic")
+SET(CMAKE_SHARED_LINKER_FLAGS "-Wl,-E -Wl,-Bsymbolic -rdynamic")
 SET(CMAKE_BUILD_TYPE Release)
 
 PROJECT(URI-Escape)
 SET(serial "1.0.0")
 SET(soserial "1")
 INCLUDE_DIRECTORIES("${PROJECT_SOURCE_DIR}" "${PROJECT_SOURCE_DIR}/../../tora/")
-ADD_LIBRARY(URI-Escape SHARED URI-Escape.cc)
+ADD_LIBRARY(URI-Escape MODULE URI-Escape.cc)
 set_target_properties(URI-Escape PROPERTIES PREFIX "")
 set_target_properties(URI-Escape PROPERTIES OUTPUT_NAME "lib/URI/Escape")