--- orig/emms.el	2005-08-28 19:38:04.000000000 -0500
+++ mod/emms.el	2005-08-28 19:37:52.000000000 -0500
@@ -41,6 +41,8 @@
 (defvar emms-version "1.3 $Revision: 1.63 $"
   "EMMS version string.")
 
+(eval-when-compile (require 'cl))
+
 (defmacro emms-define-obsolete-variable-alias
   (obsolete-name current-name &optional when docstring)
   "Make OBSOLETE-NAME an obsolete variable alias for CURRENT-NAME.
@@ -408,17 +410,17 @@
 Insert at IDX, which defaults to the end."
   (let ((idx (or idx (length emms-playlist))))
     (emms-playlist-set-playlist
-     (vconcat (substring emms-playlist 0 idx)
+     (vconcat (subseq emms-playlist 0 idx)
               (if emms-playlist-sort-added-tracks-p
                   (emms-playlist-sort-vector seq)
                 seq)
-              (substring emms-playlist idx)))))
+              (subseq emms-playlist idx)))))
 
 (defun emms-playlist-remove (idx)
   "Remove track at IDX from the EMMS playlist."
   (emms-playlist-set-playlist
-   (vconcat (substring emms-playlist 0 idx)
-	    (substring emms-playlist (1+ idx)))))
+   (vconcat (subseq emms-playlist 0 idx)
+            (subseq emms-playlist (1+ idx)))))
 
 (defun emms-playlist-search-vector (track vector)
   "Return the index of TRACK in VECTOR, or nil if not found.