diff --git a/index.html b/index.html
index 5c49957..d74bfa7 100644
--- a/index.html
+++ b/index.html
@@ -682,6 +682,32 @@
                                     </div>
                                 </div>
                             </fieldset>
+                            <fieldset id="export-includes" class="form-group">
+                                <div class="row">
+                                    <legend
+                                        class="col-form-label col-sm-2"
+                                        data-i18n="export.include"
+                                    >
+                                        Include
+                                    </legend>
+                                    <div class="col-sm-10">
+                                        <div class="form-check">
+                                            <label class="form-check-label">
+                                                <input
+                                                    class="form-check-input"
+                                                    id="include-waypoints"
+                                                    type="checkbox"
+                                                    name="include-waypoints"
+                                                />
+                                                <span
+                                                    data-i18n="export.include_waypoints"
+                                                    >Waypoints</span
+                                                >
+                                            </label>
+                                        </div>
+                                    </div>
+                                </div>
+                            </fieldset>
                             <div class="modal-footer">
                                 <button
                                     type="button"
diff --git a/js/control/Export.js b/js/control/Export.js
index 6352457..5e9e9f1 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 includeWaypoints = exportForm['include-waypoints'].checked;
 
-        var uri = this.router.getUrl(this.latLngs, format, name);
+        var uri = this.router.getUrl(
+            this.latLngs,
+            format,
+            name,
+            includeWaypoints
+        );
 
         var evt = document.createEvent('MouseEvents');
         evt.initMouseEvent(
diff --git a/js/router/BRouter.js b/js/router/BRouter.js
index 7a5357a..c3cfb2c 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,7 @@ L.BRouter = L.Class.extend({
                     trackname: trackname
                 })
             );
+        if (exportWaypoints) args.push('exportWaypoints=1');
 
         var prepend_host = format != null;