diff --git a/biology/fasta3/Makefile b/biology/fasta3/Makefile
index 6b0f1bcb69d6..1242345d8cc8 100644
--- a/biology/fasta3/Makefile
+++ b/biology/fasta3/Makefile
@@ -2,13 +2,13 @@
 # $FreeBSD$
 
 PORTNAME=	fasta3
-PORTVERSION=	36.3.2
+PORTVERSION=	36.3.6
 CATEGORIES=	biology
 MASTER_SITES=	http://faculty.virginia.edu/wrpearson/fasta/fasta36/
 DISTNAME=	fasta-${PORTVERSION}
 
-MAINTAINER=	wen@FreeBSD.org
-COMMENT=	A collection of programs for searching DNA and protein databases
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Collection of programs for searching DNA and protein databases
 
 NO_CDROM=	May not be sold or incorporated into a commercial product
 WRKSRC=		${WRKDIR}/${DISTNAME}
@@ -23,8 +23,8 @@ FASTA_HOST!=	/usr/bin/uname -n
 MAKE_ENV+=	THR_LIBS=${PTHREAD_LIBS} XDIR=${XDIR} \
 		FASTA_HOST='"${FASTA_HOST}"'
 
-FASTA3_DOCS=	README.versions fasta3x.me fasta3x.doc \
-		fasta20.doc fasta_func.doc readme.* fasta.defaults \
+FASTA3_DOCS=	README.versions \
+		fasta_func.doc readme.* fasta.defaults \
 		fasta.options fasta_versions.html changes*.html
 DATA=		data/*.mat
 EXAMPLES=	seq/*.aa seq/*.lc seq/*.seq seq/*.lib
diff --git a/biology/fasta3/distinfo b/biology/fasta3/distinfo
index 18f14d4f2af2..5b43051cc345 100644
--- a/biology/fasta3/distinfo
+++ b/biology/fasta3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fasta-36.3.2.tar.gz) = 1eddb7dac3a52311d43bac854b2153c13aa23cbb163952c9e385a75aa2b9e446
-SIZE (fasta-36.3.2.tar.gz) = 711876
+SHA256 (fasta-36.3.6.tar.gz) = d6c526c307941fe8c98a16406cb01df6bb5712d3c2b7f4a90e126ceba682db6f
+SIZE (fasta-36.3.6.tar.gz) = 995298
diff --git a/biology/fasta3/files/patch-Makefile.pcom_s b/biology/fasta3/files/patch-Makefile.pcom_s
new file mode 100644
index 000000000000..a6f2e5da4930
--- /dev/null
+++ b/biology/fasta3/files/patch-Makefile.pcom_s
@@ -0,0 +1,11 @@
+--- make/Makefile.pcom_s.orig	2013-07-19 16:13:59.000000000 +0800
++++ make/Makefile.pcom_s	2013-07-19 16:14:57.000000000 +0800
+@@ -46,7 +46,7 @@
+ 	rm -f *.o $(PROGS); 	rm -rf $(BIN)/*
+ 
+ install: $(PROGS)
+-	pushd $(BIN); cp $(PROGS)  $(XDIR); popd
++	cd $(BIN); cp $(PROGS) $(XDIR); cd ../src
+ 
+ uinstall: $(PROGS)
+ 	pushd $(BIN); cp $(PROGS)  $(UDIR); popd
diff --git a/biology/fasta3/files/patch-Makefile.pcom_t b/biology/fasta3/files/patch-Makefile.pcom_t
new file mode 100644
index 000000000000..3a4f0e08dcc7
--- /dev/null
+++ b/biology/fasta3/files/patch-Makefile.pcom_t
@@ -0,0 +1,11 @@
+--- make/Makefile.pcom_t.orig	2013-07-19 16:14:08.000000000 +0800
++++ make/Makefile.pcom_t	2013-07-19 16:14:34.000000000 +0800
+@@ -42,7 +42,7 @@
+ 	rm -f *.o $(PROGS); 	rm -rf $(BIN)/*
+ 
+ install: $(PROGS)
+-	pushd $(BIN); cp $(PROGS)  $(XDIR); popd
++	cd $(BIN); cp $(PROGS) $(XDIR); cd ../src
+ 
+ uinstall: $(PROGS)
+ 	pushd $(BIN); cp $(PROGS)  $(UDIR); popd
diff --git a/biology/fasta3/pkg-plist b/biology/fasta3/pkg-plist
index 1e5d72a5e1fd..366f41e77b71 100644
--- a/biology/fasta3/pkg-plist
+++ b/biology/fasta3/pkg-plist
@@ -1,42 +1,26 @@
 bin/fasta%%VER%%
-bin/fasta%%VER%%_t
 bin/fastf%%VER%%
-bin/fastf%%VER%%_t
 bin/fastm%%VER%%
-bin/fastm%%VER%%_t
 bin/fasts%%VER%%
-bin/fasts%%VER%%_t
 bin/fastx%%VER%%
-bin/fastx%%VER%%_t
 bin/fasty%%VER%%
-bin/fasty%%VER%%_t
 bin/ggsearch%%VER%%
-bin/ggsearch%%VER%%_t
 bin/glsearch%%VER%%
-bin/glsearch%%VER%%_t
 bin/lalign%%VER%%
 bin/lav2ps
 bin/lav2svg
 bin/map_db
 bin/ssearch%%VER%%
-bin/ssearch%%VER%%_t
 bin/tfastf%%VER%%
-bin/tfastf%%VER%%_t
 bin/tfastm%%VER%%
 bin/tfasts%%VER%%
-bin/tfasts%%VER%%_t
 bin/tfastx%%VER%%
-bin/tfastx%%VER%%_t
 bin/tfasty%%VER%%
-bin/tfasty%%VER%%_t
 etc/fastlibs.sample
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
 %%PORTDOCS%%%%DOCSDIR%%/FASTA_LIST
 %%PORTDOCS%%%%DOCSDIR%%/README.versions
-%%PORTDOCS%%%%DOCSDIR%%/fasta3x.me
-%%PORTDOCS%%%%DOCSDIR%%/fasta3x.doc
-%%PORTDOCS%%%%DOCSDIR%%/fasta20.doc
 %%PORTDOCS%%%%DOCSDIR%%/fasta_func.doc
 %%PORTDOCS%%%%DOCSDIR%%/readme.v30
 %%PORTDOCS%%%%DOCSDIR%%/readme.v30t6
@@ -55,6 +39,7 @@ etc/fastlibs.sample
 %%PORTDOCS%%%%DOCSDIR%%/changes_v34.html
 %%PORTDOCS%%%%DOCSDIR%%/changes_v35.html
 %%PORTDOCS%%%%DOCSDIR%%/changes_v36.html
+%%EXAMPLESDIR%%/dyr_human.aa
 %%EXAMPLESDIR%%/egmsmg.aa
 %%EXAMPLESDIR%%/gstt1_drome.aa
 %%EXAMPLESDIR%%/gtm1_human.aa