diff --git a/codebase/superdarn/src.bin/tk/plot/field_plot.1.12/doc/field_plot.doc.xml b/codebase/superdarn/src.bin/tk/plot/field_plot.1.12/doc/field_plot.doc.xml
index 9dec20d97..14408592a 100644
--- a/codebase/superdarn/src.bin/tk/plot/field_plot.1.12/doc/field_plot.doc.xml
+++ b/codebase/superdarn/src.bin/tk/plot/field_plot.1.12/doc/field_plot.doc.xml
@@ -134,6 +134,8 @@
 </option>
 <option><on>-maxbeam <ar>maxbeam</ar></on><od>set the maximum number of beams to draw for the radar field of view outline to <ar>maxbeam</ar>.</od>
 </option>
+<option><on>-databeam</on><od>set the minimum and maximum number of beams to draw for the radar field of view according to the data in each scan (default is to use the radar hardware file).</od>
+</option>
 <option><on>-dot</on><od>Mark the location of the radar site with a dot.</od>
 </option>
 <option><on>-dotr <ar>radius</ar></on><od>set the radius of the dot used to mark the station.</od>
diff --git a/codebase/superdarn/src.bin/tk/plot/field_plot.1.12/field_plot.c b/codebase/superdarn/src.bin/tk/plot/field_plot.1.12/field_plot.c
index 7f515b288..ef8187340 100644
--- a/codebase/superdarn/src.bin/tk/plot/field_plot.1.12/field_plot.c
+++ b/codebase/superdarn/src.bin/tk/plot/field_plot.1.12/field_plot.c
@@ -666,6 +666,7 @@ int main(int argc,char *argv[]) {
 
   int minbeam=0;
   int maxbeam=-1;
+  unsigned char databeam=0;
 
   char *chnstr=NULL;
 
@@ -894,6 +895,7 @@ int main(int argc,char *argv[]) {
 
   OptionAdd(&opt,"minbeam",'i',&minbeam);
   OptionAdd(&opt,"maxbeam",'i',&maxbeam);
+  OptionAdd(&opt,"databeam",'x',&databeam);
 
   OptionAdd(&opt,"gscol",'t',&gscol_txt);
 
@@ -1735,6 +1737,16 @@ int main(int argc,char *argv[]) {
                                  ffovcol,0x0f,0.5,NULL,
                                  rfov,1);
 
+      if (databeam) {
+        minbeam=999;
+        maxbeam=-1;
+        for (c=0;c<scn->num;c++) {
+          if (scn->bm[c].bm < minbeam) minbeam=scn->bm[c].bm;
+          if (scn->bm[c].bm > maxbeam) maxbeam=scn->bm[c].bm;
+        }
+        maxbeam=maxbeam+1;
+      }
+
       for (c=0;c<scn->num;c++) {
         if ((sflg) && (scn->bm[c].scan !=scan)) continue;
         if ((nsflg) && (scn->bm[c].scan<0)) continue;
diff --git a/codebase/superdarn/src.bin/tk/plot/field_plot.1.12/plot_outline.c b/codebase/superdarn/src.bin/tk/plot/field_plot.1.12/plot_outline.c
index 3d2de84c5..4b34416e2 100644
--- a/codebase/superdarn/src.bin/tk/plot/field_plot.1.12/plot_outline.c
+++ b/codebase/superdarn/src.bin/tk/plot/field_plot.1.12/plot_outline.c
@@ -131,6 +131,7 @@ void plot_outline(struct Plot *plot,struct RadarBeam *sbm,
     }
   }
 
+  if ((gbm->bm < minbeam) || (gbm->bm >= maxbeam)) return;
 
   if (magflg) {
        map[0]=gbm->mlat[0][0];