diff --git a/docs/CHANGELOG b/docs/CHANGELOG
index c451fe34..6950a9c9 100755
--- a/docs/CHANGELOG
+++ b/docs/CHANGELOG
@@ -4,6 +4,7 @@
 
 --------------------------------------------------------------------------
   v.3.4-Alpha3 
+	- Fixed Playlist Play links
 	- Added ability to gather album art for a single catalog at a time
 	- Improved Upgrade Documentation
 	- Disabled more functionality when in Demo Mode because people
diff --git a/templates/show_playlist.inc.php b/templates/show_playlist.inc.php
index 6c14210d..f9f0a946 100644
--- a/templates/show_playlist.inc.php
+++ b/templates/show_playlist.inc.php
@@ -27,8 +27,8 @@ $web_path = Config::get('web_path');
 <?php show_box_top($playlist->name . ' ' . _('Playlist')); ?>
 		<ul class="text-action">
 		<li><a href="<?php echo $web_path; ?>/playlist.php?action=normalize_tracks&amp;playlist_id=<?php echo $playlist->id; ?>"><?php echo _('Normalize Tracks'); ?></a></li>
-		<li><a href="<?php echo $web_path; ?>/stream.php?action=play_selected&amp;playlist_id=<?php echo $playlist->id; ?>"><?php echo _('Play This Playlist'); ?></a></li>
-		<li><a href="<?php echo $web_path; ?>/stream.php?action=playlist_random&amp;playlist_id=<?php echo $playlist->id; ?>"><?php echo _('Play Random'); ?></a></li>
+		<li><?php echo Ajax::text('?action=basket&type=playlist&id=' . $playlist->id,_('Play All'),'play_playlist'); ?></li>
+		<li><?php echo Ajax::text('?action=basket&type=playlist_random&id=' . $playlist->id,_('Play Random'),'play_playlist'); ?></li>
 		</ul>
 <?php show_box_bottom(); ?>
 <?php show_box_top(); ?>