diff --git a/comms/xastir/Makefile b/comms/xastir/Makefile
index 4053f4e108f5..2face5502c61 100644
--- a/comms/xastir/Makefile
+++ b/comms/xastir/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xastir
-PORTVERSION=	1.9.8
-PORTREVISION=	6
+PORTVERSION=	2.0.0
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-stable/${PORTNAME}-${PORTVERSION}
 
diff --git a/comms/xastir/distinfo b/comms/xastir/distinfo
index 1a1005cf8b31..67a3997ef73f 100644
--- a/comms/xastir/distinfo
+++ b/comms/xastir/distinfo
@@ -1,3 +1,2 @@
-MD5 (xastir-1.9.8.tar.gz) = 7598a25ada47e322e0aafec1ca242b0c
-SHA256 (xastir-1.9.8.tar.gz) = 11006763874bf8a9bcf034f4fd1ff4de4d0038fb26f3df94798f2e89a4a22cdf
-SIZE (xastir-1.9.8.tar.gz) = 2471489
+SHA256 (xastir-2.0.0.tar.gz) = a7834f9adc802da8fb45c15656efa2f85a5b930dc414251af4cb6b490ddb7281
+SIZE (xastir-2.0.0.tar.gz) = 2544827
diff --git a/comms/xastir/files/patch-main.c b/comms/xastir/files/patch-main.c
deleted file mode 100644
index 6eaa14c20a2c..000000000000
--- a/comms/xastir/files/patch-main.c
+++ /dev/null
@@ -1,19 +0,0 @@
-
---- src/main.c      11 Mar 2010 04:03:58 -0000      1.792
-+++ src/main.c      7 May 2010 16:23:16 -0000       1.793
-@@ -9018,6 +9018,12 @@
-             "create_appshell Menu Popup",
-             al,
-             ac);
-+#if XmVersion >= 2000
-+    XtVaSetValues(right_menu_popup, XmNpopupEnabled, XmPOPUP_DISABLED, NULL);
-+    XtUngrabButton(da, AnyButton, AnyModifier);
-+#else
-+    XtVaSetValues(right_menu_popup, XmNpopupEnabled, False, NULL);
-+#endif
-     //XtVaSetValues(right_menu_popup, XmNwhichButton, 3, NULL);
- 
-     ac = 0;
-
-
-
diff --git a/comms/xastir/pkg-plist b/comms/xastir/pkg-plist
index faef18dbbf68..caf5bf022085 100644
--- a/comms/xastir/pkg-plist
+++ b/comms/xastir/pkg-plist
@@ -27,6 +27,7 @@ lib/xastir/overlay.pl
 lib/xastir/ozi2geo.pl
 lib/xastir/permutations.pl
 lib/xastir/pos2shp.pl
+lib/xastir/ridge_radar.pl
 lib/xastir/slideshow.pl
 lib/xastir/split_gnis.bash
 lib/xastir/split_gnis.pl
@@ -49,14 +50,21 @@ lib/xastir/xastir-migrate.sh
 %%DOCSDIR%%/LICENSE
 %%DOCSDIR%%/README
 %%DOCSDIR%%/README.CVS
+%%DOCSDIR%%/README.CYGWIN
 %%DOCSDIR%%/README.Contributing
 %%DOCSDIR%%/README.Getting-Started
 %%DOCSDIR%%/README.MAPS
+%%DOCSDIR%%/README.OSM_maps
 %%DOCSDIR%%/README.win32
 %%DOCSDIR%%/UPGRADE
 %%DATADIR%%/Counties/placeholder
 %%DATADIR%%/GNIS/placeholder
 %%DATADIR%%/config/24kgrid.dbfawk
+%%DATADIR%%/config/OSM_Cloudmade_administrative.dbfawk
+%%DATADIR%%/config/OSM_Cloudmade_highway.dbfawk
+%%DATADIR%%/config/OSM_Cloudmade_natural.dbfawk
+%%DATADIR%%/config/OSM_Cloudmade_poi.dbfawk
+%%DATADIR%%/config/OSM_Cloudmade_water_and_coastline.dbfawk
 %%DATADIR%%/config/arealm.dbfawk
 %%DATADIR%%/config/areawater.dbfawk
 %%DATADIR%%/config/cousub.dbfawk
@@ -89,6 +97,7 @@ lib/xastir/xastir-migrate.sh
 %%DATADIR%%/config/nwsz1ddmmyy.dbfawk
 %%DATADIR%%/config/nwsz_ddmmyy.dbfawk
 %%DATADIR%%/config/nwsz_ddmmyy_09.dbfawk
+%%DATADIR%%/config/nwsz_ddmmyy_10.dbfawk
 %%DATADIR%%/config/nwszoddmmyy.dbfawk
 %%DATADIR%%/config/pointlm.dbfawk
 %%DATADIR%%/config/predefined_EVENT.sys
@@ -105,6 +114,17 @@ lib/xastir/xastir-migrate.sh
 %%DATADIR%%/config/tgrlpy.dbfawk
 %%DATADIR%%/config/tgrplc00.dbfawk
 %%DATADIR%%/config/tgrwat.dbfawk
+%%DATADIR%%/config/tl_2009_aiannh.dbfawk
+%%DATADIR%%/config/tl_2009_aits.dbfawk
+%%DATADIR%%/config/tl_2009_arealm.dbfawk
+%%DATADIR%%/config/tl_2009_areawater.dbfawk
+%%DATADIR%%/config/tl_2009_county.dbfawk
+%%DATADIR%%/config/tl_2009_cousub.dbfawk
+%%DATADIR%%/config/tl_2009_edges.dbfawk
+%%DATADIR%%/config/tl_2009_mil.dbfawk
+%%DATADIR%%/config/tl_2009_nn_county.dbfawk
+%%DATADIR%%/config/tl_2009_pointlm.dbfawk
+%%DATADIR%%/config/tl_2009_zcta5.dbfawk
 %%DATADIR%%/config/tnc-startup.aea
 %%DATADIR%%/config/tnc-startup.d700
 %%DATADIR%%/config/tnc-startup.kam
@@ -130,9 +150,24 @@ lib/xastir/xastir-migrate.sh
 %%DATADIR%%/help/help-Italian.dat
 %%DATADIR%%/help/help-Portuguese.dat
 %%DATADIR%%/help/help-Spanish.dat
+%%DATADIR%%/maps/CC_OpenStreetMap.png
+%%DATADIR%%/maps/CC_OpenStreetMap_logo.png
+%%DATADIR%%/maps/CC_OpenStreetMap_txt.png
 %%DATADIR%%/maps/GPS/placeholder
 %%DATADIR%%/maps/Online/CanadaTopo250k.geo
 %%DATADIR%%/maps/Online/CanadaTopo50k.geo
+%%DATADIR%%/maps/Online/OSM_cloudmade_1.geo
+%%DATADIR%%/maps/Online/OSM_cloudmade_2.geo
+%%DATADIR%%/maps/Online/OSM_cloudmade_5.geo
+%%DATADIR%%/maps/Online/OSM_cloudmade_998.geo
+%%DATADIR%%/maps/Online/OSM_cloudmade_999.geo
+%%DATADIR%%/maps/Online/OSM_tiled_cycle.geo
+%%DATADIR%%/maps/Online/OSM_tiled_mapnik.geo
+%%DATADIR%%/maps/Online/OSM_tiled_osmarender.geo
+%%DATADIR%%/maps/Online/OSM_tiled_skiing.geo
+%%DATADIR%%/maps/Online/OSM_tiled_topOSM_0_relief.geo
+%%DATADIR%%/maps/Online/OSM_tiled_topOSM_1_contour.geo
+%%DATADIR%%/maps/Online/OSM_tiled_topOSM_2_features.geo
 %%DATADIR%%/maps/Online/TXRadar.geo
 %%DATADIR%%/maps/Online/USRadar.geo
 %%DATADIR%%/maps/Online/WMSRadar.geo
@@ -140,7 +175,6 @@ lib/xastir/xastir-migrate.sh
 %%DATADIR%%/maps/Online/terraserver-topo.geo
 %%DATADIR%%/maps/Online/terraserver-urban.geo
 %%DATADIR%%/maps/Online/terraserver.geo
-%%DATADIR%%/maps/Online/tigermap.geo
 %%DATADIR%%/maps/worldhi.map
 %%DATADIR%%/sounds/placeholder
 %%DATADIR%%/symbols/13pct.xbm