diff --git a/airtime_mvc/application/controllers/PlaylistController.php b/airtime_mvc/application/controllers/PlaylistController.php
index 97e2b3d73..d352344ff 100644
--- a/airtime_mvc/application/controllers/PlaylistController.php
+++ b/airtime_mvc/application/controllers/PlaylistController.php
@@ -155,7 +155,7 @@ class PlaylistController extends Zend_Controller_Action
 
     private function wrongTypeToPlaylist($obj)
     {
-        $this->view->error = "You can only add tracks and smart blocks to playlists.";
+        $this->view->error = "You can only add tracks, smart blocks, and webstreams to playlists.";
         $this->createFullResponse($obj);
     }
 
diff --git a/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js b/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js
index e4a1d7d93..6ade8636f 100644
--- a/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js
+++ b/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js
@@ -134,7 +134,8 @@ var AIRTIME = (function(AIRTIME){
 				//process selected files/playlists.
 				for (i = 0, length = aData.length; i < length; i++) {
 					temp = aData[i];
-					if (temp.ftype === "audioclip" || temp.ftype === "block") {
+					if (temp.ftype === "audioclip" || temp.ftype === "block" ||
+					    (temp.ftype === "stream" && $("#obj_type").val() === "playlist")) {
 						aMediaIds.push(new Array (temp.id, temp.ftype));
 					}
 				}
@@ -144,7 +145,7 @@ var AIRTIME = (function(AIRTIME){
 			        if ($('#obj_type').val() == 'block') {
 			            alert('You can only add tracks to smart blocks.');
 			        } else if ($('#obj_type').val() == 'playlist') {
-			            alert('You can only add tracks and smart blocks to playlists.');
+			            alert('You can only add tracks, smart blocks, and webstreams to playlists.');
 			        }
 			    }
 			});