diff --git a/xulmus/NEWS b/xulmus/NEWS
index 09d9921b..ed5bc0a9 100644
--- a/xulmus/NEWS
+++ b/xulmus/NEWS
@@ -9,6 +9,7 @@
     * :dialog {subscribe|newsmartplaylist}
     * add :displaypane and :dpclose
     * rename :filter to :queue and :Filter to :filter
+    * add 'repeat' and 'shuffle'
 
 2009-03-28:
     * version 0.1
diff --git a/xulmus/content/player.js b/xulmus/content/player.js
index 9a2fcb75..0af9f8bc 100644
--- a/xulmus/content/player.js
+++ b/xulmus/content/player.js
@@ -75,6 +75,33 @@ function Player() // {{{
         gMM.removeListener(mediaCoreListener);
     });
 
+    /////////////////////////////////////////////////////////////////////////////}}}
+    ////////////////////// OPTIONS /////////////////////////////////////////////////
+    /////////////////////////////////////////////////////////////////////////////{{{
+
+    options.add(["repeat"],
+        "Set the playback repeat mode",
+        "number", 0,
+        {
+            setter: function (value) gMM.sequencer.repeatMode = value,
+            getter: function () gMM.sequencer.repeatMode,
+            completer: function (context) [
+                ["0", "Repeat none"],
+                ["1", "Repeat one"],
+                ["2", "Repeat all"]
+            ],
+            validator: Option.validateCompleter
+        });
+
+    options.add(["shuffle"],
+        "Play tracks in shuffled order",
+        "boolean", false,
+        {
+            setter: function (value) value ? gMM.sequencer.mode = gMM.sequencer.MODE_SHUFFLE :
+                                             gMM.sequencer.mode = gMM.sequencer.MODE_FORWARD,
+            getter: function () gMM.sequencer.mode == gMM.sequencer.MODE_SHUFFLE
+        });
+
     /////////////////////////////////////////////////////////////////////////////}}}
     ////////////////////// MAPPINGS ////////////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
diff --git a/xulmus/locale/en-US/index.txt b/xulmus/locale/en-US/index.txt
index bbf1ee03..385db8a6 100644
--- a/xulmus/locale/en-US/index.txt
+++ b/xulmus/locale/en-US/index.txt
@@ -340,6 +340,7 @@ section:Options[option-index]
 ||'popups'|| Where to show requested popup windows +
 ||'preload'|| Speed up first time history/bookmark completion +
 ||'previouspattern'|| Patterns to use when guessing the \'previous' page in a document sequence +
+||'repeat'|| Set the playback repeat mode +
 ||'runtimepath'|| List of directories searched for runtime files +
 ||'scroll'|| Number of lines to scroll with [m]<C-u>[m] and [m]<C-d>[m] commands +
 ||'shell'|| Shell to use for executing [c]:![c] and [c]:run[c] commands +
@@ -347,6 +348,7 @@ section:Options[option-index]
 ||'showmode'|| Show the current mode in the command line +
 ||'showstatuslinks'|| Show the destination of the link under the cursor in the status bar +
 ||'showtabline'|| Control when to show the tab bar of opened web pages +
+||'shuffle'|| Play tracks in shuffled order +
 ||'smartcase'|| Override the 'ignorecase' option if the pattern contains uppercase characters +
 ||'suggestengines'|| Engine Alias which has a feature of suggest +
 ||'titlestring'|| Change the title of the window +
diff --git a/xulmus/locale/en-US/options.txt b/xulmus/locale/en-US/options.txt
index 9bcd2de3..b2ff0321 100644
--- a/xulmus/locale/en-US/options.txt
+++ b/xulmus/locale/en-US/options.txt
@@ -595,6 +595,20 @@ link elements are those defined by 'hinttags'.
 ____
 
 
+|\'repeat'|
+||'repeat'|| number (default: 0)
+____
+Set the playback repeat mode.
+
+.---`-----------
+*0*  Repeat none
+*1*  Repeat one
+*2*  Repeat all
+----------------
+
+____
+
+
 |$XULMUS_RUNTIME|
 |\'rtp'| |\'runtimepath'|
 ||'runtimepath' 'rtp'|| stringlist
@@ -678,6 +692,12 @@ Control when to show the tab bar of opened web pages. Possible values:
 ____
 
 
+|\'shuffle'|
+||'shuffle'|| boolean (default: false)
+____
+Play tracks in shuffled order.
+____
+
 |\'noscs'| |\'nosmartcase'| |\'scs'| |\'smartcase'|
 ||'smartcase' 'scs'|| boolean (default: on)
 ____