diff --git a/CMakeLists.txt b/CMakeLists.txt
index 28c5fc10..7c7f7990 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -120,17 +120,17 @@ if(ENABLE_I3)
   if(NOT I3_EXECUTABLE)
     # graceful fail
     message(WARNING "Disabling i3 support since executable was not found")
-    set(ENABLE_ALSA OFF)
+    set(ENABLE_I3 OFF)
   endif()
 endif()
 
 if(ENABLE_MPD)
   find_package("LibMPDClient")
-  if(LibMPDClient_FOUND)
+  if(LIBMPDCLIENT_FOUND)
     include_directories(${LIBMPDCLIENT_INCLUDE_DIRS})
     link_directories(${LIBMPDCLIENT_LIBRARY_DIRS})
     set(LINK_LIBS ${LINK_LIBS} ${LIBMPDCLIENT_LIBRARY})
-  else(LibMPDClient_FOUND)
+  else(LIBMPDCLIENT_FOUND)
     # graceful fail
     message(WARNING "Disabling mpd since required package wasn't found")
     set(ENABLE_MPD OFF)
@@ -139,11 +139,10 @@ endif()
 
 if(ENABLE_NETWORK)
   find_package("Libiw")
-  if(LibMPDClient_FOUND)
-    include_directories(${LIBMPDCLIENT_INCLUDE_DIRS})
-    link_directories(${LIBMPDCLIENT_LIBRARY_DIRS})
-    set(LINK_LIBS ${LINK_LIBS} ${LIBMPDCLIENT_LIBRARY})
-  else(Libiw_FOUND)
+  if(LIBIW_FOUND)
+    include_directories(${LIBIW_INCLUDE_DIR})
+    set(LINK_LIBS ${LINK_LIBS} ${LIBIW_LIBRARY})
+  else(LIBIW_FOUND)
     # graceful fail
     message(WARNING "Disabling network support since required library wasn't found")
     set(ENABLE_NETWORK OFF)