--- a/configure.ac
+++ b/configure.ac
@@ -1,15 +1,14 @@
-AC_INIT([upmpdcli], [0.8.3], [jfd@lesbonscomptes.com],
+AC_INIT([upmpdcli], [0.8.4], [jfd@lesbonscomptes.com],
              [upmpdcli], [http://www.lesbonscomptes.com/upmpdcli])
 AC_PREREQ([2.53])
-AC_CONFIG_SRCDIR([libupnpp/upnpplib.hxx])
-AC_CONFIG_HEADERS([libupnpp/config.h])
+AC_CONFIG_SRCDIR([src/upmpd.cxx])
+AC_CONFIG_HEADERS([src/config.h])
 
 AM_INIT_AUTOMAKE([1.10 no-define subdir-objects foreign])
-AC_DISABLE_STATIC
-LT_INIT
 
 AC_PROG_CXX
 
+# ! Not sure that this is needed for upmpdcli and not only libupnpp
 # libupnp is configured with large file support, and we need to do the same,
 # else a difference in off_t size impacts struct File_Info and prevents the
 # vdir to work. This does make a difference, for exemple, for Raspbian
@@ -19,23 +18,12 @@
 AC_DEFINE([_LARGE_FILE_SOURCE], [], [Large files support])
 AC_DEFINE([_FILE_OFFSET_BITS], [64], [File Offset size])
 
-AC_CHECK_LIB([rt], [clock_gettime], [], [])
 AC_CHECK_LIB([pthread], [pthread_create], [], [])
-AC_CHECK_LIB([upnp], [UpnpInit], [], AC_MSG_ERROR([libupnp not found]))
-AC_CHECK_LIB([curl], [curl_easy_init], [], AC_MSG_ERROR([libcurl not found]))
-AC_CHECK_LIB([ixml], [ixmlDocument_getElementsByTagName], [], 
-		     AC_MSG_ERROR([libixml (usually installed as part of libupnp) not found]))
-AC_CHECK_FUNCS([getifaddrs] [UpnpSetLogLevel])
-AC_CHECK_LIB([expat], [XML_ParserCreate], [], 
-		      AC_MSG_ERROR([libexpat not found]))
-LIBUPNPP_LIBS="$LIBS"
-
+AC_CHECK_LIB([upnpp], [UPnPP::getLibUPnP], [], [])
 AC_CHECK_LIB([mpdclient], [mpd_connection_new], [],
                      AC_MSG_ERROR([libmpdclient not found]))
 
 LIBS=""
                      
-AC_SUBST(LIBUPNPP_LIBS)
-
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT