diff --git a/comms/xastir/Makefile b/comms/xastir/Makefile
index b3f4e6d59deb..82899dbbb5c0 100644
--- a/comms/xastir/Makefile
+++ b/comms/xastir/Makefile
@@ -24,7 +24,7 @@ SHEBANG_FILES=	scripts/*.pl scripts/get-maptools.sh \
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	SHAPELIB DBFAWK MAGICK CURL GEOTIFF GDAL GPSMAN FESTIVAL \
-		    RTREE ERRORPOP BDB OPTCFLAGS
+		RTREE ERRORPOP BDB
 
 SHAPELIB_DESC=	Include Shapelib support
 DBFAWK_DESC=	Include DBFAWK Support
@@ -37,7 +37,6 @@ FESTIVAL_DESC=	Include Festival Voice Synthesis Support
 RTREE_DESC=	Enable spatial indexing of shapefiles
 ERRORPOP_DESC=	Send error popups to stderr
 BDB_DESC=	Tiger Map Caching using Berkeley DB
-OPTCFLAGS_DESC=	Use optimized CFLAGS (-O2 -pipe)
 
 OPTIONS_DEFAULT=	SHAPELIB DBFAWK MAGICK CURL RTREE BDB
 
@@ -71,8 +70,4 @@ ERRORPOP_CONFIGURE_WITH=	errorpopups
 BDB_USES=		bdb
 BDB_CONFIGURE_ON=	--with-bdb-incdir=${BDB_INCLUDE_DIR} --with-bdb-libdir=${BDB_LIB_DIR}
 
-OPTCFLAGS_CFLAGS=	-O2 -pipe
-
-BROKEN_sparc64=		Does not compile on sparc64
-
 .include <bsd.port.mk>
diff --git a/comms/xastir/files/patch-src_Makefile.in b/comms/xastir/files/patch-src_Makefile.in
new file mode 100644
index 000000000000..1866382287cc
--- /dev/null
+++ b/comms/xastir/files/patch-src_Makefile.in
@@ -0,0 +1,15 @@
+--- src/Makefile.in.orig	2014-09-12 19:05:57 UTC
++++ src/Makefile.in
+@@ -522,6 +522,12 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xa_config.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xastir_udp_client.Po@am__quote@
+ 
++ifeq ($(host_cpu),sparc64)
++draw_symbols.o: draw_symbols.c
++@am__fastdepCC_TRUE@	$(patsubst -O%,-O0,$(COMPILE)) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++endif
++
+ .c.o:
+ @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po