diff --git a/CMakeLists.txt b/CMakeLists.txt
index aea57c9c..7a3f7021 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -214,10 +214,10 @@ set(dbus_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 find_package(dbus)
 endif()
 
-if(ENABLE_YAHOO2)
-	set(yahoo2_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
-	find_package(yahoo2)
-endif()
+#if(ENABLE_YAHOO2)
+#	set(yahoo2_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
+#	find_package(yahoo2)
+#endif()
 
 ####### Miscallanous ######
 
@@ -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")