diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3cc08cf2b1b0c4be71b1c3accceb1c91c8169408..c5e63bc5042469b5075b65d9ee3bec22a54154dc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -390,16 +390,17 @@ if (PROTOBUF_FOUND)
 		message("Skype plugin      : no (does not run on Win32)")
 	endif()
 
- 	if(YAHOO2_FOUND)
-		message("Libyahoo2 plugin  : yes")
- 		include_directories(${YAHOO2_INCLUDE_DIR})
-	else()
+#  	if(YAHOO2_FOUND)
+# 		message("Libyahoo2 plugin  : yes")
+#  		include_directories(${YAHOO2_INCLUDE_DIR})
+# 	else()
 		if(ENABLE_YAHOO2)
-			message("Libyahoo2 plugin  : no (install libyahoo2-devel)")
+			set(YAHOO2_FOUND 1)
+			message("Libyahoo2 plugin  : yes")
 		else(ENABLE_YAHOO2)
 			message("Libyahoo2 plugin  : no (user disabled)")
 		endif()
- 	endif()
+#  	endif()
 
 	if(ENABLE_SWIFTEN)
 		message("Swiften plugin    : yes")