diff --git a/.prettierrc b/.prettierrc
index 18815a1..cd93fd9 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -1,4 +1,4 @@
 {
-	"singleQuote": true,
-	"tabWidth": 4
-}
\ No newline at end of file
+    "singleQuote": true,
+    "tabWidth": 4
+}
diff --git a/css/leaflet-routing.css b/css/leaflet-routing.css
index 6e098e4..540c852 100644
--- a/css/leaflet-routing.css
+++ b/css/leaflet-routing.css
@@ -1,5 +1,5 @@
 div.line-mouse-marker {
-  background-color: white;
-  border: 4px solid magenta;
-  border-radius: 8px;
+    background-color: white;
+    border: 4px solid magenta;
+    border-radius: 8px;
 }
diff --git a/index.html b/index.html
index f3841a2..c7387fa 100644
--- a/index.html
+++ b/index.html
@@ -680,6 +680,28 @@
                                             </label>
                                         </div>
                                     </div>
+                                    <legend
+                                        class="col-form-label col-sm-2"
+                                        data-i18n="export.exportWaypoints"
+                                    >
+                                        <label
+                                            class="form-check-label"
+                                            for="export-waypoints"
+                                        >
+                                            Include waypoints
+                                        </label>
+                                    </legend>
+                                    <div class="col-sm-10">
+                                        <div class="form-check">
+                                            <input
+                                                class="form-check-input"
+                                                id="export-waypoints"
+                                                type="checkbox"
+                                                name="export-waypoints"
+                                                value="1"
+                                            />
+                                        </div>
+                                    </div>
                                 </div>
                             </fieldset>
                             <div class="modal-footer">
diff --git a/js/control/Export.js b/js/control/Export.js
index 6352457..68c2b1d 100644
--- a/js/control/Export.js
+++ b/js/control/Export.js
@@ -45,8 +45,14 @@ BR.Export = L.Class.extend({
             exportForm['format'].value ||
             $('#export-format input:radio:checked').val();
         var name = encodeURIComponent(exportForm['trackname'].value);
+        var exportWaypoints = exportForm['export-waypoints'].checked;
 
-        var uri = this.router.getUrl(this.latLngs, format, name);
+        var uri = this.router.getUrl(
+            this.latLngs,
+            format,
+            name,
+            exportWaypoints
+        );
 
         var evt = document.createEvent('MouseEvents');
         evt.initMouseEvent(
diff --git a/js/router/BRouter.js b/js/router/BRouter.js
index 7a5357a..ddddc51 100644
--- a/js/router/BRouter.js
+++ b/js/router/BRouter.js
@@ -111,7 +111,7 @@ L.BRouter = L.Class.extend({
         return opts;
     },
 
-    getUrl: function(latLngs, format, trackname) {
+    getUrl: function(latLngs, format, trackname, exportWaypoints) {
         var urlParams = this.getUrlParams(latLngs, format);
 
         var args = [];
@@ -137,6 +137,12 @@ L.BRouter = L.Class.extend({
                     trackname: trackname
                 })
             );
+        if (exportWaypoints)
+            args.push(
+                L.Util.template('exportWaypoints={exportWaypoints}', {
+                    exportWaypoints: +exportWaypoints
+                })
+            );
 
         var prepend_host = format != null;