diff -urN amarok-2.4.0.90.orig/CMakeLists.txt amarok-2.4.0.90/CMakeLists.txt
--- amarok-2.4.0.90.orig/CMakeLists.txt	2011-04-19 00:03:27.910000016 +0000
+++ amarok-2.4.0.90/CMakeLists.txt	2011-04-19 00:06:17.466666683 +0000
@@ -105,6 +105,10 @@
     macro_optional_find_package(QJSON)
     macro_log_feature( QJSON_FOUND "QJson" "Qt JSON Parser used for the Playdar Collection" "http://qjson.sourceforge.net/" FALSE "" "" )
 
+    # HUpnp is required for the upnp plugin
+    macro_optional_find_package(HUpnp)
+    macro_log_feature ( HUPNP_FOUND "HUpnp" "HUpnp is an universal Plug and Play Library" "http://herqq.org/" FALSE "" "" )
+
     # We tell users that we need 1.0.3, but we really check just >= 1.0.0. This is because
     # upstream forgot to update version in lastfm/global.h, so it looks like 1.0.2. :-(
     # will be fixed in liblastfm-1.0.4
diff -urN amarok-2.4.0.90.orig/src/core-impl/collections/CMakeLists.txt amarok-2.4.0.90/src/core-impl/collections/CMakeLists.txt
--- amarok-2.4.0.90.orig/src/core-impl/collections/CMakeLists.txt	2011-04-19 00:03:27.940000015 +0000
+++ amarok-2.4.0.90/src/core-impl/collections/CMakeLists.txt	2011-04-19 00:07:06.753333348 +0000
@@ -25,5 +25,7 @@
 if( QJSON_FOUND )
     add_subdirectory( playdarcollection )
 endif( QJSON_FOUND )
-add_subdirectory( upnpcollection )
+if( HUPNP_FOUND )
+    add_subdirectory( upnpcollection )
+endif( HUPNP_FOUND )
 add_subdirectory( nepomukcollection )
diff -urN amarok-2.4.0.90.orig/cmake/modules/FindHUpnp.cmake amarok-2.4.0.90/cmake/modules/FindHUpnp.cmake
--- amarok-2.4.0.90.orig/cmake/modules/FindHUpnp.cmake	2011-04-19 01:59:14.313333349 +0000
+++ amarok-2.4.0.90/cmake/modules/FindHUpnp.cmake	2011-04-19 02:14:13.670000016 +0000
@@ -6,7 +6,7 @@
 # HUPNP_LIBRARIES
 # HUPNP_FOUND
 
-find_path(HUPNP_INCLUDE_DIR HUpnp HINTS ${KDE4_INCLUDE_DIR})
+find_path(HUPNP_INCLUDE_DIR HUpnp HINTS ${KDE4_INCLUDE_DIR} /usr/include/HUpnpCore)
 
 find_library(HUPNP_LIBRARIES HUpnp PATHS ${KDE4_LIB_DIR})