diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2aced72..2376a14 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,18 +16,9 @@ configure_file(
 )
 
 include_directories("${PROJECT_BINARY_DIR}")
+include_directories(/opt/mozjpeg/include)
 
-set(MOZJPEG_INCLUDE /opt/mozjpeg/include)
-set(MOZJPEG_LIB32 /opt/mozjpeg/lib)
-set(MOZJPEG_LIB64 /opt/mozjpeg/lib64)
-
-include_directories(${MOZJPEG_INCLUDE})
-
-if(EXISTS ${MOZJPEG_LIB64})
-    link_directories(${MOZJPEG_LIB64})
-else()
-    link_directories(${MOZJPEG_LIB32})
-endif()
+link_directories(/opt/mozjpeg/lib)
 
 add_subdirectory(caesium)
 add_subdirectory(demo)
diff --git a/caesium/CMakeLists.txt b/caesium/CMakeLists.txt
index 93fe8e2..1ca7d97 100644
--- a/caesium/CMakeLists.txt
+++ b/caesium/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(CMAKE_C_FLAGS "--std=gnu99 -fPIC ${CMAKE_C_FLAGS}")
+set(CMAKE_C_FLAGS "--std=gnu99 -fPIC")
 
 find_library(zoflipng zopflipng /usr/local/lib)
 find_library(jpeg /opt/mozjpeg/lib)
@@ -9,11 +9,13 @@ add_library(caesium_static STATIC caesium.c error.c utils.c png.c lodepng.c jpeg
 
 set_target_properties(caesium_static PROPERTIES OUTPUT_NAME caesium)
 
+target_link_libraries(caesium_static zopflipng jpeg turbojpeg tiff)
 target_link_libraries(caesium zopflipng jpeg turbojpeg tiff)
 
 # Make sure the compiler can find include files for our Caesium library
 # when other libraries or executables link to Caesium
 target_include_directories(caesium PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+target_include_directories(caesium_static PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
 install(FILES caesium.h DESTINATION include)
 install(TARGETS caesium caesium_static