diff --git a/src/Train/ErgFile.cpp b/src/Train/ErgFile.cpp
index a109a859b..91173a056 100644
--- a/src/Train/ErgFile.cpp
+++ b/src/Train/ErgFile.cpp
@@ -685,6 +685,9 @@ ErgFile::save(QStringList &errors)
         out << "[COURSE DATA]\n";
 
         bool first=true;
+        long lastLap = 0;
+        double lastPointX = 0;
+
         foreach(ErgFilePoint p, Points) {
 
             // output
@@ -694,6 +697,22 @@ ErgFile::save(QStringList &errors)
             // we scale back if needed
             if (Ftp && CP) watts = (double(p.y)/CP) * Ftp;
 
+            // check if a lap marker should be inserted
+            foreach(ErgFileLap l, Laps) {
+                bool addLap = false;
+                if (l.x == p.x && lastLap != l.x) {
+                    // this is the case where a lap marker matches a load marker
+                    addLap = true;
+                } else if (l.x > lastPointX && l.x < p.x) {
+                    // this is the case when a lap marker exist between two load markers
+                    addLap = true;
+                }
+                if (addLap) {
+                    out <<QString("%1    LAP\n").arg(minutes, 0, 'f', 2);
+                    lastLap = l.x;
+                }
+            }
+
             if (first) {
                 first=false;
 
@@ -705,6 +724,8 @@ ErgFile::save(QStringList &errors)
 
             // output in minutes and watts
             out <<QString("%1    %2\n").arg(minutes, 0, 'f', 2).arg(watts);
+
+            lastPointX = p.x;
         }
 
         out << "[END COURSE DATA]\n";
diff --git a/src/Train/WorkoutWidget.cpp b/src/Train/WorkoutWidget.cpp
index ed4694208..03461e382 100644
--- a/src/Train/WorkoutWidget.cpp
+++ b/src/Train/WorkoutWidget.cpp
@@ -122,6 +122,8 @@ WorkoutWidget::updateErgFile(ErgFile *f)
         f->Duration = p->x * 1000; // whatever the last is
     }
 
+    f->Laps = laps_;
+
     // update METADATA too
     // XXX missing!
 }
@@ -1475,6 +1477,7 @@ WorkoutWidget::save()
         ergFile->Points.append(ErgFilePoint(p->x * 1000, p->y, p->y));
         ergFile->Duration = p->x * 1000; // whatever the last is
     }
+    ergFile->Laps = laps_;
 
     //
     // SAVE
@@ -1783,6 +1786,16 @@ WorkoutWidget::qwkcode()
         // how long is this section ?
         int duration = points_[i+1]->x - points_[i]->x;
 
+        bool hasStartLapMarker, hasEndLapMarker;
+        hasStartLapMarker = hasEndLapMarker = false;
+
+        foreach(ErgFileLap l, laps_) {
+            if (l.x == points_[i]->x*1000)
+                hasStartLapMarker = true;
+            if (l.x == points_[i+1]->x*1000)
+                hasEndLapMarker = true;
+        }
+
         // if duration is 0 its a rise, so move on 1
         if (duration <=0) {
 
@@ -1817,6 +1830,9 @@ WorkoutWidget::qwkcode()
             ap = ((points_[i]->y + points_[i+1]->y) / 2) / CP * 100.0f;
         }
 
+        if (hasEndLapMarker && hasStartLapMarker) {
+            section.append("L");
+        }
         blocks << section;
         blockp << i;
         aps << ap;
@@ -1834,6 +1850,7 @@ WorkoutWidget::qwkcode()
         // if we were above recovery and next is below recovery we have
         // an effort followed by some recovery so join together
         if ((i < aps.count() -1) && aps[i] > RECOVERY && aps[i+1]<aps[i] && aps[i+1] < RECOVERY && !blocks[i+1].startsWith("0@")) {
+            section.remove("L");
             section += "r" + blocks[i+1];
             i++;
         }
@@ -1954,7 +1971,6 @@ WorkoutWidget::fromQwkcode(QString code)
 void
 WorkoutWidget::apply(QString code)
 {
-
     // clear points etc
     state = none;
     dragging = NULL;
@@ -1974,6 +1990,8 @@ WorkoutWidget::apply(QString code)
     codePoints.clear();
     codeStrings = code.split("\n");
 
+    laps_.clear();
+
     foreach(QString line, code.split("\n")) {
 
         //
@@ -1981,7 +1999,7 @@ WorkoutWidget::apply(QString code)
         //
         // A line can be (using [] to express optionality
         //
-        // [Nx]t1@w1[-w2][rt2@w3[-w4]]
+        // [Nx]t1@w1[-w2][rt2@w3[-w4]][L]
         //
         // Where Nx      - Repeat N times
         //       t1@w1   - Time t1 at Watts w1
@@ -1989,11 +2007,12 @@ WorkoutWidget::apply(QString code)
         //
         //       rt2@w3  - Optional recovery time t2 at watts w3
         //       -w4     - Optionally recover from time t2 watts w3 to watts w4
+        //       L       - Optionally add laps to encapsulate sections added by this qwkcode line
         //
         //       time t2/t2 can be expressed as a number and may
         //       optionally be followed by m or s for minutes or seconds
         //       if no units specified defaults to minutes
-        QRegExp qwk("([0-9]+x)?([0-9]+[ms]?)@([0-9]+)(-[0-9]+)?(r([0-9]+[ms]?)@([0-9]+)(-[0-9]+)?)?");
+        QRegExp qwk("([0-9]+x)?([0-9]+[ms]?)@([0-9]+)(-[0-9]+)?(r([0-9]+[ms]?)@([0-9]+)(-[0-9]+)?)?([L])?");
 
         // REGEXP capture texts
         //
@@ -2006,6 +2025,7 @@ WorkoutWidget::apply(QString code)
         // 6 - Recovery Duration with trailing units (optional) e.g. "3m"
         // 7 - Recovery watts without units e.g. "70"
         // 8 - Recovert rise to with leading minus e.g. "-100"
+        // 9 - Trailing L if lap markers is to be added
         //
         // Obviously if not present then the captured text will be blank
         // but we always get 9 captured texts.
@@ -2018,6 +2038,8 @@ WorkoutWidget::apply(QString code)
             // extract the values to use when adding
             int count, t1, t2, w1, w2, w3, w4;
 
+            bool insertLapMarkers = false;
+
             // initialise
             count = 1;
             t1 = t2 = w1 = w2 = w3 = w4 = -1;
@@ -2073,6 +2095,9 @@ WorkoutWidget::apply(QString code)
             // w4
             if (qwk.cap(8) != "") w4 = -1 * qwk.cap(8).toInt();
 
+            // insert lap markers?
+            if (qwk.cap(9) == "L") insertLapMarkers = true;
+
             //DEBUGqDebug()<<"PARSE:" << qwk.cap(0) <<"count:"<<count<<"EFFORT:"<<t1<<w1<<w2<<"RECOVERY:"<<t2<<w3<<w4;
 
             //
@@ -2085,6 +2110,16 @@ WorkoutWidget::apply(QString code)
                 if (w1 != watts) {
                     index++;
                     new WWPoint(this, secs, w1);
+                    bool addLap = laps_.isEmpty() ? true : (laps_.last().x != secs*1000) && secs != 0;
+                    if (insertLapMarkers && addLap)
+                    {
+                        ErgFileLap lap;
+                        lap.x = secs*1000;
+                        lap.LapNum = laps_.length() + 1;
+                        lap.selected = false;
+                        lap.name = "";
+                        laps_.append(lap);
+                    }
                 }
 
                 // end of block
@@ -2093,11 +2128,32 @@ WorkoutWidget::apply(QString code)
                 index++;
                 new WWPoint(this, secs, watts);
 
+                bool addLap = laps_.isEmpty() ? true : (laps_.last().x != secs*1000);
+                if (insertLapMarkers && addLap)
+                {
+                    ErgFileLap lap;
+                    lap.x = secs*1000;
+                    lap.LapNum = laps_.length() + 1;
+                    lap.selected = false;
+                    lap.name = "";
+                    laps_.append(lap);
+                }
+
                 // RECOVERY
                 if (t2 > 0) {
                     if (w3 != watts) {
                         index++;
                         new WWPoint(this, secs, w3);
+                        bool addLap = laps_.isEmpty() ? true : (laps_.last().x != secs*1000);
+                        if (insertLapMarkers && addLap)
+                        {
+                            ErgFileLap lap;
+                            lap.x = secs*1000;
+                            lap.LapNum = laps_.length() + 1;
+                            lap.selected = false;
+                            lap.name = "";
+                            laps_.append(lap);
+                        }
                     }
 
                     // end of recovery block
@@ -2105,6 +2161,16 @@ WorkoutWidget::apply(QString code)
                     watts = w4 >0 ? w4 : w3;
                     index++;
                     new WWPoint(this,secs,watts);
+                    bool addLap = laps_.isEmpty() ? true : (laps_.last().x != secs*1000);
+                    if (insertLapMarkers && addLap)
+                    {
+                        ErgFileLap lap;
+                        lap.x = secs*1000;
+                        lap.LapNum = laps_.length() + 1;
+                        lap.selected = false;
+                        lap.name = "";
+                        laps_.append(lap);
+                    }
                 }
             }
         }