diff --git a/databases/fastdb/Makefile b/databases/fastdb/Makefile
index 01b45056905a..b4847f28dcf3 100644
--- a/databases/fastdb/Makefile
+++ b/databases/fastdb/Makefile
@@ -7,11 +7,11 @@
 #
 
 PORTNAME=	fastdb
-PORTVERSION=	2.16
+PORTVERSION=	2.22
 CATEGORIES=	databases
 MASTER_SITES=	http://www.ispras.ru/~knizhnik/
 
-MAINTAINER=	ijliao@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_GMAKE=	yes
@@ -20,6 +20,8 @@ MAKEFILE=	makefile
 INSTALLS_SHLIB=	yes
 
 post-patch:
-	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/makefile
+	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g ; \
+		s,%%PTHREAD_CFLAGS%%,${PTHREAD_CFLAGS},g ; \
+		s,%%PTHREAD_LIBS%%,${PTHREAD_LIBS},g" ${WRKSRC}/makefile
 
 .include <bsd.port.mk>
diff --git a/databases/fastdb/distinfo b/databases/fastdb/distinfo
index cf0124d12085..3987557765c1 100644
--- a/databases/fastdb/distinfo
+++ b/databases/fastdb/distinfo
@@ -1 +1 @@
-MD5 (fastdb-2.16.tar.gz) = 205450982e029692310f148ce208500b
+MD5 (fastdb-2.22.tar.gz) = a544b9d6d6e70a60322b93fcc82e6557
diff --git a/databases/fastdb/files/patch-makefile b/databases/fastdb/files/patch-makefile
index 5d28fee02bc7..e4b4c71bb161 100644
--- a/databases/fastdb/files/patch-makefile
+++ b/databases/fastdb/files/patch-makefile
@@ -1,5 +1,5 @@
---- makefile.orig	Sat Jul 22 00:34:36 2000
-+++ makefile	Fri Mar  2 23:57:53 2001
+--- makefile.orig	Fri Apr  6 23:14:06 2001
++++ makefile	Thu Jul 12 00:40:24 2001
 @@ -2,13 +2,13 @@
  # Makefile for Generic Unix with GCC compiler
  
@@ -17,7 +17,27 @@
  
  OBJS = class.o compiler.o database.o hashtab.o file.o symtab.o ttree.o \
  	cursor.o query.o wwwapi.o unisock.o sync.o
-@@ -259,7 +259,6 @@
+@@ -30,8 +30,8 @@
+ TFLAGS=-pthread
+ THRLIBS=
+ else 
+-TFLAGS=-D_REENTRANT -D_THREAD_SAFE
+-THRLIBS=-lpthread
++TFLAGS=-D_REENTRANT -D_THREAD_SAFE %%PTHREAD_CFLAGS%%
++THRLIBS=%%PTHREAD_LIBS%%
+ endif
+ SUFF=_r
+ endif
+@@ -64,7 +64,7 @@
+ #DEFS =-DTHROW_EXCEPTION_ON_ERROR -DUSE_QUEUE_MANAGER
+ DEFS = -DUSE_QUEUE_MANAGER -DUSE_LOCALE_SETTINGS
+ 
+-CFLAGS = $(TFLAGS) -c -Wall -O5 -g $(TFLAGS) 
++CFLAGS += $(TFLAGS) -c $(TFLAGS) 
+ 
+ #CFLAGS = -c -Wall -O0 -g $(DEFS) $(TFLAGS)
+ #CFLAGS = -c -Wall -O0 -DDEBUG=DEBUG_TRACE -g $(DEFS) $(TFLAGS)
+@@ -258,7 +258,6 @@
  	cp $(INCS) $(INCSPATH)
  	mkdir -p $(LIBSPATH)
  	cp $(FASTDB_LIB) $(CLI_LIB) $(FASTDB_SHARED) $(CLI_SHARED) $(LIBSPATH)