diff --git a/src/core/commandlineoptions.cpp b/src/core/commandlineoptions.cpp
index b6fe5b100..b9c3fd123 100644
--- a/src/core/commandlineoptions.cpp
+++ b/src/core/commandlineoptions.cpp
@@ -220,7 +220,7 @@ bool CommandlineOptions::Parse() {
   // Get any filenames or URLs following the arguments
   for (int i=optind ; i<argc_ ; ++i) {
     QString value = QFile::decodeName(argv_[i]);
-    if (value.contains("://"))
+    if (value.contains(":"))
       urls_ << value;
     else
       urls_ << QUrl::fromLocalFile(QFileInfo(value).canonicalFilePath());
diff --git a/src/core/songloader.cpp b/src/core/songloader.cpp
index 7457b4fc9..64d5c65c5 100644
--- a/src/core/songloader.cpp
+++ b/src/core/songloader.cpp
@@ -65,7 +65,7 @@ SongLoader::SongLoader(LibraryBackendInterface* library, QObject *parent)
 {
   if (sRawUriSchemes.isEmpty()) {
     sRawUriSchemes << "udp" << "mms" << "mmsh" << "mmst" << "mmsu" << "rtsp"
-                   << "rtspu" << "rtspt" << "rtsph";
+                   << "rtspu" << "rtspt" << "rtsph" << "spotify";
   }
 
   timeout_timer_->setSingleShot(true);