diff --git a/src/baseplayer.cpp b/src/baseplayer.cpp
index e7302da543c..93e3725164e 100644
--- a/src/baseplayer.cpp
+++ b/src/baseplayer.cpp
@@ -9,6 +9,6 @@ BasePlayer::~BasePlayer() {
 
 }
 
-const QString BasePlayer::getGroup() {
+const QString BasePlayer::getGroup() const {
     return m_group;
 }
diff --git a/src/baseplayer.h b/src/baseplayer.h
index dfbf868c15f..f736b61c741 100644
--- a/src/baseplayer.h
+++ b/src/baseplayer.h
@@ -10,7 +10,7 @@ class BasePlayer : public QObject {
     BasePlayer(QObject* pParent, QString group);
     virtual ~BasePlayer();
 
-    const QString getGroup();
+    const QString getGroup() const;
 
   private:
     const QString m_group;
diff --git a/src/dlgprefcontrols.cpp b/src/dlgprefcontrols.cpp
index a157b4973a2..09361fadd9e 100644
--- a/src/dlgprefcontrols.cpp
+++ b/src/dlgprefcontrols.cpp
@@ -195,6 +195,11 @@ DlgPrefControls::DlgPrefControls(QWidget * parent, MixxxApp * mixxx,
     ComboBoxAutoDjRequeue->setCurrentIndex(m_pConfig->getValueString(ConfigKey("[Auto DJ]", "Requeue")).toInt());
     connect(ComboBoxAutoDjRequeue, SIGNAL(activated(int)), this, SLOT(slotSetAutoDjRequeue(int)));
 
+    // Ordering of decks, if configurable
+    int deck_count = static_cast<int>(m_pNumDecks->get());
+    updateDeckOrderCombo(deck_count);
+    connect(ComboBoxDeckOrder, SIGNAL(activated(int)), this, SLOT(slotSetDeckOrder(int)));
+
 #ifdef __AUTODJCRATES__
 
     // The minimum available for randomly-selected tracks
@@ -448,6 +453,14 @@ void DlgPrefControls::slotSetAutoDjRequeue(int)
     m_pConfig->set(ConfigKey("[Auto DJ]", "Requeue"), ConfigValue(ComboBoxAutoDjRequeue->currentIndex()));
 }
 
+void DlgPrefControls::slotSetDeckOrder(int)
+{
+    QString deckorder = ComboBoxDeckOrder->currentText();
+    m_pConfig->set(ConfigKey("[Controls]", "DeckOrder"), ConfigValue(deckorder));
+    updateDeckOrderCombo(static_cast<int>(m_pNumDecks->get()));
+    m_pPlayerManager->setDeckOrder(deckorder);
+}
+
 void DlgPrefControls::slotSetAutoDjMinimumAvailable(int a_iValue) {
 #ifdef __AUTODJCRATES__
     QString str;
@@ -497,6 +510,8 @@ void DlgPrefControls::slotSetSkin(int)
     checkSkinResolution(ComboBoxSkinconf->currentText())
             ? warningLabel->hide() : warningLabel->show();
     slotUpdateSchemes();
+    const int deck_count = static_cast<int>(m_pNumDecks->get());
+    updateDeckOrderCombo(deck_count);
 }
 
 void DlgPrefControls::slotSetPositionDisplay(int)
@@ -596,6 +611,7 @@ void DlgPrefControls::slotApply()
     else
         m_pConfig->set(ConfigKey("[Controls]","RateDir"), ConfigValue(1));
 
+    slotSetDeckOrder(ComboBoxDeckOrder->currentIndex());
 }
 
 void DlgPrefControls::slotSetFrameRate(int frameRate) {
@@ -759,6 +775,7 @@ void DlgPrefControls::slotNumDecksChanged(double new_count) {
     m_iNumConfiguredDecks = numdecks;
     slotSetRateDir(m_pConfig->getValueString(ConfigKey("[Controls]","RateDir")).toInt());
     slotSetRateRange(m_pConfig->getValueString(ConfigKey("[Controls]","RateRange")).toInt());
+    updateDeckOrderCombo(numdecks);
 }
 
 void DlgPrefControls::slotNumSamplersChanged(double new_count) {
@@ -783,3 +800,46 @@ void DlgPrefControls::slotNumSamplersChanged(double new_count) {
     slotSetRateDir(m_pConfig->getValueString(ConfigKey("[Controls]","RateDir")).toInt());
     slotSetRateRange(m_pConfig->getValueString(ConfigKey("[Controls]","RateRange")).toInt());
 }
+
+void DlgPrefControls::updateDeckOrderCombo(int deck_count) {
+    // We always try to find the configured order because the skin deckcount value isn't set
+    // at construction time. We'll receive a signal when that value changes, this function
+    // will get called, and then we'll set the proper ordering. Since we update the config
+    // every time they change the value, this shouldn't cause weird overwrites.
+
+    // Temporarily, all 4-deck setups will use the same order
+    QString config_order;
+    if (deck_count == 4) {
+        config_order = "CABD";
+    } else {
+        config_order = PlayerManager::getDefaultOrder(deck_count).label;
+    }
+
+    // Eventually, load from config:
+    //QString config_order = m_pConfig->getValueString(ConfigKey("[Controls]", "DeckOrder"));
+    //textDeckOrder->setVisible(deck_count != 0);
+    //ComboBoxDeckOrder->setVisible(deck_count != 0);
+    ComboBoxDeckOrder->clear();
+    if (deck_count == 0) {
+        return;
+    }
+
+    int deckorder_index = -1;
+    int i = 0;
+    foreach(const PlayerManager::DeckOrderingManager::deck_order_t& order,
+            PlayerManager::getDeckOrderings(deck_count)) {
+        ComboBoxDeckOrder->addItem(order.label);
+        if (order.label == config_order) {
+            deckorder_index = i;
+        }
+        ++i;
+    }
+    if (deckorder_index >= 0) {
+        ComboBoxDeckOrder->setCurrentIndex(deckorder_index);
+        if (ComboBoxDeckOrder->currentText() != config_order) {
+            m_pConfig->set(ConfigKey("[Controls]", "DeckOrder"),
+                           ConfigValue(ComboBoxDeckOrder->currentText()));
+        }
+        m_pPlayerManager->setDeckOrder(config_order);
+    }
+}
diff --git a/src/dlgprefcontrols.h b/src/dlgprefcontrols.h
index 340ed7679a3..a4ed028c3fd 100644
--- a/src/dlgprefcontrols.h
+++ b/src/dlgprefcontrols.h
@@ -67,11 +67,11 @@ class DlgPrefControls : public DlgPreferencePage, public Ui::DlgPrefControlsDlg
     void slotSetAutoDjMinimumAvailable(int);
     void slotSetAutoDjUseIgnoreTime(int);
     void slotSetAutoDjIgnoreTime(const QTime &a_rTime);
+    void slotSetDeckOrder(int);
     void slotSetRateRamp(bool);
     void slotSetRateRampSensitivity(int);
     void slotSetLocale(int);
 
-
     void slotSetFrameRate(int frameRate);
     void slotSetWaveformType(int index);
     void slotSetWaveformOverviewType(int index);
@@ -84,6 +84,7 @@ class DlgPrefControls : public DlgPreferencePage, public Ui::DlgPrefControlsDlg
     void slotSetNormalizeOverview( bool normalize);
     void slotWaveformMeasured(float frameRate, int rtErrorCnt);
 
+  private slots:
     void slotNumDecksChanged(double);
     void slotNumSamplersChanged(double);
 
@@ -91,6 +92,7 @@ class DlgPrefControls : public DlgPreferencePage, public Ui::DlgPrefControlsDlg
     void initWaveformControl();
     void notifyRebootNecessary();
     bool checkSkinResolution(QString skin);
+    void updateDeckOrderCombo(int deck_count);
 
     ConfigObject<ConfigValue>* m_pConfig;
     ControlObject* m_pControlPositionDisplay;
diff --git a/src/dlgprefcontrolsdlg.ui b/src/dlgprefcontrolsdlg.ui
index ce71b3c2148..a6a763a9f84 100644
--- a/src/dlgprefcontrolsdlg.ui
+++ b/src/dlgprefcontrolsdlg.ui
@@ -80,7 +80,7 @@
        </property>
       </widget>
      </item>
-     <item row="3" column="0">
+     <item row="4" column="0">
       <widget class="QLabel" name="TextLabel6_2_2_3">
        <property name="enabled">
         <bool>true</bool>
@@ -99,7 +99,7 @@
        </property>
       </widget>
      </item>
-     <item row="3" column="1" colspan="2">
+     <item row="4" column="1" colspan="2">
       <widget class="QComboBox" name="ComboBoxPosition">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -112,7 +112,7 @@
        </property>
       </widget>
      </item>
-     <item row="4" column="0">
+     <item row="5" column="0">
       <widget class="QLabel" name="TextLabel6_2_2_3_2">
        <property name="enabled">
         <bool>true</bool>
@@ -131,7 +131,7 @@
        </property>
       </widget>
      </item>
-     <item row="4" column="1" colspan="2">
+     <item row="5" column="1" colspan="2">
       <widget class="QComboBox" name="ComboBoxTooltips">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -144,7 +144,7 @@
        </property>
       </widget>
      </item>
-     <item row="5" column="0">
+     <item row="6" column="0">
       <widget class="QLabel" name="TextLabel6">
        <property name="enabled">
         <bool>true</bool>
@@ -163,7 +163,7 @@
        </property>
       </widget>
      </item>
-     <item row="5" column="1" colspan="2">
+     <item row="6" column="1" colspan="2">
       <widget class="QComboBox" name="ComboBoxRateRange">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -176,7 +176,7 @@
        </property>
       </widget>
      </item>
-     <item row="6" column="0">
+     <item row="7" column="0">
       <widget class="QLabel" name="TextLabel6_2">
        <property name="enabled">
         <bool>true</bool>
@@ -195,7 +195,7 @@
        </property>
       </widget>
      </item>
-     <item row="6" column="1" colspan="2">
+     <item row="7" column="1" colspan="2">
       <widget class="QComboBox" name="ComboBoxRateDir">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -208,7 +208,23 @@
        </property>
       </widget>
      </item>
-     <item row="9" column="0">
+     <item row="3" column="1" colspan="2">
+      <widget class="QComboBox" name="ComboBoxDeckOrder"/>
+     </item>
+     <item row="3" column="0">
+      <widget class="QLabel" name="textDeckOrder">
+       <property name="text">
+        <string>Deck track load order</string>
+       </property>
+       <property name="buddy">
+        <cstring>ComboBoxDeckOrder</cstring>
+       </property>
+       <property name="visible">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="10" column="0">
       <widget class="QLabel" name="textLabelAllowTrackLoadToPlayingDeck">
        <property name="text">
         <string>Track load behavior</string>
@@ -218,10 +234,10 @@
        </property>
       </widget>
      </item>
-     <item row="9" column="1" colspan="2">
+     <item row="10" column="1" colspan="2">
       <widget class="QComboBox" name="ComboBoxAllowTrackLoadToPlayingDeck"/>
      </item>
-     <item row="8" column="0">
+     <item row="9" column="0">
       <widget class="QLabel" name="labelCueBehaviour">
        <property name="text">
         <string>Cue behavior</string>
@@ -231,10 +247,10 @@
        </property>
       </widget>
      </item>
-     <item row="8" column="1" colspan="2">
+     <item row="9" column="1" colspan="2">
       <widget class="QComboBox" name="ComboBoxCueDefault"/>
      </item>
-     <item row="7" column="0">
+     <item row="8" column="0">
       <widget class="QLabel" name="textLabelCueRecall">
        <property name="text">
         <string>Auto Recall Cue</string>
@@ -244,10 +260,10 @@
        </property>
       </widget>
      </item>
-     <item row="7" column="1" colspan="2">
+     <item row="8" column="1" colspan="2">
       <widget class="QComboBox" name="ComboBoxCueRecall"/>
      </item>
-     <item row="10" column="0">
+     <item row="11" column="0">
       <widget class="QLabel" name="textAutoDjRequeue">
        <property name="text">
         <string>Re-queue tracks in Auto DJ</string>
@@ -257,10 +273,10 @@
        </property>
       </widget>
      </item>
-     <item row="10" column="1" colspan="2">
+     <item row="11" column="1" colspan="2">
       <widget class="QComboBox" name="ComboBoxAutoDjRequeue"/>
      </item>
-     <item row="13" column="0">
+     <item row="14" column="0">
       <widget class="QLabel" name="textLabelLocale">
        <property name="text">
         <string>Locale</string>
@@ -270,7 +286,7 @@
        </property>
       </widget>
      </item>
-     <item row="13" column="1" colspan="2">
+     <item row="14" column="1" colspan="2">
       <widget class="QComboBox" name="ComboBoxLocale"/>
      </item>
      <item row="1" column="1" colspan="2">
@@ -283,14 +299,14 @@
        </property>
       </widget>
      </item>
-     <item row="11" column="0">
+    <item row="12" column="0">
       <widget class="QLabel" name="autoDjMinimumAvailableLabel">
        <property name="text">
         <string>Auto DJ: Minimum available tracks [%]</string>
        </property>
       </widget>
      </item>
-     <item row="11" column="1" colspan="2">
+     <item row="12" column="1" colspan="2">
       <widget class="QSpinBox" name="autoDjMinimumAvailableSpinBox">
        <property name="toolTip">
         <string>This percentage of tracks are always available for selecting, regardless of when they were last played.</string>
@@ -303,7 +319,7 @@
        </property>
       </widget>
      </item>
-     <item row="12" column="0">
+     <item row="13" column="0">
       <widget class="QCheckBox" name="autoDjIgnoreTimeCheckBox">
        <property name="toolTip">
         <string>Uncheck, to ignore all played tracks.</string>
@@ -313,7 +329,7 @@
        </property>
       </widget>
      </item>
-     <item row="12" column="1" colspan="2">
+     <item row="13" column="1" colspan="2">
       <widget class="QTimeEdit" name="autoDjIgnoreTimeEdit">
        <property name="toolTip">
         <string>Duration after which a track is eligible for selection by Auto DJ again</string>
diff --git a/src/playermanager.cpp b/src/playermanager.cpp
index ba7651c586d..3dc5b401db5 100644
--- a/src/playermanager.cpp
+++ b/src/playermanager.cpp
@@ -19,6 +19,11 @@
 #include "util/stat.h"
 #include "engine/enginedeck.h"
 
+// static
+PlayerManager::DeckOrderingManager PlayerManager::s_deckOrderingManager =
+    PlayerManager::DeckOrderingManager();
+PlayerManager::DeckOrderingManager::deck_order_t PlayerManager::s_currentDeckOrder;
+
 PlayerManager::PlayerManager(ConfigObject<ConfigValue>* pConfig,
                              SoundManager* pSoundManager,
                              EngineMaster* pEngine) :
@@ -181,6 +186,36 @@ void PlayerManager::slotNumDecksControlChanged(double v) {
     }
 }
 
+void PlayerManager::setDeckOrder(QString deckorder) {
+    int num_decks = m_pCONumDecks->get();
+    bool found_valid = false;
+    foreach(const PlayerManager::DeckOrderingManager::deck_order_t& order,
+            PlayerManager::getDeckOrderings(num_decks)) {
+        if (order.label == deckorder) {
+            found_valid = true;
+            s_currentDeckOrder = order;
+        }
+    }
+    if (!found_valid) {
+        s_currentDeckOrder = s_deckOrderingManager.getDefaultOrder(num_decks);
+    }
+    reorientDecks();
+}
+
+void PlayerManager::reorientDecks() {
+    int total_decks = static_cast<int>(m_pCONumDecks->get());
+    for (int i = 1; i < total_decks + 1; ++i) {
+        ControlObject* orientation =
+            ControlObject::getControl(
+                ConfigKey(QString("[Channel%1]").arg(i), "orientation"));
+        if (i > total_decks / 2) {
+            orientation->set(EngineChannel::RIGHT);
+        } else {
+            orientation->set(EngineChannel::LEFT);
+        }
+    }
+}
+
 void PlayerManager::slotNumSamplersControlChanged(double v) {
     QMutexLocker locker(&m_mutex);
     int num = (int)v;
@@ -372,9 +407,9 @@ void PlayerManager::slotLoadToSampler(QString location, int sampler) {
 
 void PlayerManager::slotLoadTrackIntoNextAvailableDeck(TrackPointer pTrack) {
     QMutexLocker locker(&m_mutex);
-    QList<Deck*>::iterator it = m_decks.begin();
-    while (it != m_decks.end()) {
-        Deck* pDeck = *it;
+
+    foreach(const int& i, s_currentDeckOrder.load_order) {
+        Deck* pDeck = m_decks.at(i);
         ControlObject* playControl =
                 ControlObject::getControl(ConfigKey(pDeck->getGroup(), "play"));
         if (playControl && playControl->get() != 1.) {
@@ -382,7 +417,6 @@ void PlayerManager::slotLoadTrackIntoNextAvailableDeck(TrackPointer pTrack) {
             pDeck->slotLoadTrack(pTrack, false);
             return;
         }
-        it++;
     }
 }
 
diff --git a/src/playermanager.h b/src/playermanager.h
index 7fa44d3955d..fc1de3ac0fb 100644
--- a/src/playermanager.h
+++ b/src/playermanager.h
@@ -85,6 +85,88 @@ class PlayerManager : public QObject {
     // Used to determine if the user has configured an input for the given vinyl deck.
     bool hasVinylInput(int inputnum) const;
 
+    class DeckOrderingManager {
+      public:
+        struct deck_order_t {
+            deck_order_t() { }
+            deck_order_t(QString l, QList<int> o) : label(l), load_order(o) { }
+
+            QString label;
+            QList<int> load_order;
+        };
+
+        typedef QHash<int, QList<deck_order_t> > orders_hash_t;
+
+        DeckOrderingManager() {
+            // Known orderings for 4-deck controllers.
+            addOrdering(4, "ABCD");
+            addOrdering(4, "CABD");
+            addOrdering(4, "ACDB");
+        }
+
+        bool addOrdering(int deck_count, QString order) {
+            deck_order_t new_order(order, makeLoadOrder(order));
+            // ordering will be empty on error
+            if (new_order.load_order.empty()) {
+                return false;
+            }
+            m_hOrdersHash[deck_count].push_back(new_order);
+            return true;
+        }
+
+        // Just take the first order in the list is default.  Make sure it's the natural ordering
+        // "ABCD..."
+        deck_order_t getDefaultOrder(int deck_count) {
+            // Don't access the hash directly in case we need to generate a default order.
+            return getDeckOrderings(deck_count).at(0);
+        }
+
+        const QList<deck_order_t> getDeckOrderings(int deck_count) {
+            orders_hash_t::const_iterator it = m_hOrdersHash.find(deck_count);
+            if (it == m_hOrdersHash.end()) {
+                m_hOrdersHash[deck_count].push_back(makeDefaultOrder(deck_count));
+            }
+            return m_hOrdersHash[deck_count];
+        }
+
+      private:
+        deck_order_t makeDefaultOrder(int deck_count) const {
+            QString str_order;
+            QList<int> int_order;
+            for (int i = 0; i < deck_count; ++i) {
+                str_order += 'A' + i;
+                int_order.push_back(i);
+            }
+            return deck_order_t(str_order, int_order);
+        }
+
+        // Constructs a list of integers for load-order based on the string.
+        // If the string has errors, then we return an empty list.
+        QList<int> makeLoadOrder(QString str_order) {
+            QList<int> int_order;
+            for (int i = 0; i < str_order.length(); ++i) {
+                int pos = str_order.indexOf('A' + i);
+                if (pos == -1) {
+                    return QList<int>();
+                }
+                int_order.push_back(pos);
+            }
+            return int_order;
+        }
+
+        orders_hash_t m_hOrdersHash;
+    };
+
+    static const QList<DeckOrderingManager::deck_order_t> getDeckOrderings(int deck_count) {
+        return s_deckOrderingManager.getDeckOrderings(deck_count);
+    }
+
+    static const DeckOrderingManager::deck_order_t getDefaultOrder(int deck_count) {
+        return s_deckOrderingManager.getDefaultOrder(deck_count);
+    }
+
+    void setDeckOrder(QString order);
+
   public slots:
     // Slots for loading tracks into a Player, which is either a Sampler or a Deck
     void slotLoadTrackToPlayer(TrackPointer pTrack, QString group, bool play = false);
@@ -120,6 +202,9 @@ class PlayerManager : public QObject {
     // Must hold m_mutex before calling this method. Internal method that
     // creates a new preview deck.
     void addPreviewDeckInner();
+    // When the skin changes, we need to change the orientations of the decks
+    // because deck B might have moved from the right to the left.
+    void reorientDecks();
 
     // Used to protect access to PlayerManager state across threads.
     mutable QMutex m_mutex;
@@ -136,6 +221,9 @@ class PlayerManager : public QObject {
     QList<Sampler*> m_samplers;
     QList<PreviewDeck*> m_preview_decks;
     QMap<QString, BaseTrackPlayer*> m_players;
+
+    static DeckOrderingManager s_deckOrderingManager;
+    static DeckOrderingManager::deck_order_t s_currentDeckOrder;
 };
 
 #endif // PLAYERMANAGER_H