diff --git a/Makefile.am b/Makefile.am
index 77ef289..7dd48cb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,8 +2,9 @@ AM_CFLAGS = -Wall -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 @STATIC_CFLAGS@
 
 SUBDIRS=po
 
-bin_PROGRAMS = minidlna testupnpdescgen
-minidlna_SOURCES = minidlna.c upnphttp.c upnpdescgen.c upnpsoap.c \
+sbin_PROGRAMS = minidlnad
+check_PROGRAMS = testupnpdescgen
+minidlnad_SOURCES = minidlna.c upnphttp.c upnpdescgen.c upnpsoap.c \
 			upnpreplyparse.c minixml.c \
 			getifaddr.c daemonize.c upnpglobalvars.c \
 			options.c minissdp.c uuid.c upnpevents.c \
@@ -12,7 +13,6 @@ minidlna_SOURCES = minidlna.c upnphttp.c upnpdescgen.c upnpsoap.c \
 			tagutils/textutils.c tagutils/misc.c tagutils/tagutils.c \
 			playlist.c image_utils.c albumart.c log.c
 
-
 #if NEED_VORBIS
 vorbisflag = -lvorbis
 #endif
@@ -21,20 +21,19 @@ vorbisflag = -lvorbis
 flacoggflag = -logg
 #endif
 
-minidlna_LDADD = \
+minidlnad_LDADD = \
 	@LIBJPEG_LIBS@ \
 	@LIBID3TAG_LIBS@ \
 	@LIBSQLITE3_LIBS@ \
 	@LIBAVFORMAT_LIBS@ \
 	@LIBAVUTIL_LIBS@ \
 	@LIBEXIF_LIBS@ \
-	@LIBDL_LIBS@ \
 	@LIBRT_LIBS@ \
 	@LIBINTL@ \
 	@LIBICONV@ \
 	-lpthread  -lFLAC  $(flacoggflag) $(vorbisflag)
 
-minidlna_LDFLAGS = @STATIC_LDFLAGS@
+minidlnad_LDFLAGS = @STATIC_LDFLAGS@
 
 testupnpdescgen_SOURCES = testupnpdescgen.c upnpdescgen.c
 testupnpdescgen_LDADD = \
@@ -44,7 +43,6 @@ testupnpdescgen_LDADD = \
 	@LIBAVFORMAT_LIBS@ \
 	@LIBAVUTIL_LIBS@ \
 	@LIBEXIF_LIBS@ \
-	@LIBDL_LIBS@ \
 	-lpthread  -lFLAC  $(flacoggflag) $(vorbisflag)
 
 
diff --git a/configure.ac b/configure.ac
index 9fbdc2c..0a54d76 100644
--- a/configure.ac
+++ b/configure.ac
@@ -104,8 +104,6 @@ AC_COMPILE_IFELSE(
 
 ################################################################################################################
 ### Library checks
-AC_CHECK_LIB([dl], [dlopen], [LIBDL_LIBS="-ldl"],)
-AC_SUBST(LIBDL_LIBS)
 
 CPPFLAGS_SAVE="$CPPFLAGS"
 for dir in "" /usr/local $INCLUDE_DIR; do