diff --git a/src/Makefile.am b/src/Makefile.am
index be8a3553..5f8a4c34 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -72,7 +72,7 @@ forked_daapd_SOURCES = main.c \
 	logger.c logger.h \
 	conffile.c conffile.h \
 	filescanner.c filescanner.h \
-	filescanner_ffmpeg.c filescanner_urlfile.c filescanner_m3u.c $(ITUNESSRC) \
+	filescanner_ffmpeg.c filescanner_m3u.c $(ITUNESSRC) \
 	mdns_avahi.c mdns.h \
 	remote_pairing.c remote_pairing.h \
 	evhttp/http.c evhttp/evhttp.h \
diff --git a/src/filescanner.c b/src/filescanner.c
index 4c865a0a..f74e6368 100644
--- a/src/filescanner.c
+++ b/src/filescanner.c
@@ -181,7 +181,7 @@ fixup_tags(struct media_file_info *mfi)
    * Default to mpeg4 video/audio for unknown file types
    * in an attempt to allow streaming of DRM-afflicted files
    */
-  if (strcmp(mfi->codectype, "unkn") == 0)
+  if (mfi->codectype && strcmp(mfi->codectype, "unkn") == 0)
     {
       if (mfi->has_video)
 	{
@@ -354,11 +354,9 @@ process_media_file(char *file, time_t mtime, off_t size, int compilation)
       if ((strcmp(ext, ".pls") == 0)
 	  || (strcmp(ext, ".url") == 0))
 	{
-	  mfi.data_kind = 1; /* url/stream */
+	  DPRINTF(E_INFO, L_SCAN, "No support for .url and .pls in this version, use .m3u\n");  
 
-	  ret = scan_url_file(file, &mfi);
-	  if (ret < 0)
-	    goto out;
+	  goto out;
 	}
       else if ((strcmp(ext, ".png") == 0)
 	       || (strcmp(ext, ".jpg") == 0))