diff --git a/databases/php4-mssql/Makefile b/databases/php4-mssql/Makefile
index dd10cd05de92..6f86f457a8d2 100644
--- a/databases/php4-mssql/Makefile
+++ b/databases/php4-mssql/Makefile
@@ -5,6 +5,7 @@
 # $FreeBSD$
 #
 
+PORTREVISION=	1
 CATEGORIES=	databases
 
 MASTERDIR=	${.CURDIR}/../../lang/php4
diff --git a/databases/php4-mssql/files/patch-php_mssql.c b/databases/php4-mssql/files/patch-php_mssql.c
new file mode 100644
index 000000000000..3f8a7450bdb6
--- /dev/null
+++ b/databases/php4-mssql/files/patch-php_mssql.c
@@ -0,0 +1,15 @@
+--- php_mssql.c	2004/12/14 17:22:10	1.86.2.41
++++ php_mssql.c	2004/12/16 21:48:17	1.86.2.42
+@@ -1206,10 +1206,8 @@ PHP_FUNCTION(mssql_query)
+ 	while ((num_fields = dbnumcols(mssql_ptr->link)) <= 0 && retvalue == SUCCEED) {
+ 		retvalue = dbresults(mssql_ptr->link);
+ 	}
+-	if (retvalue != SUCCEED) {
+-		RETURN_FALSE;
+-	}
+-	if ((num_fields = dbnumcols(mssql_ptr->link)) <= 0) {
++
++	if (num_fields <= 0) {
+ 		RETURN_TRUE;
+ 	}
+
diff --git a/databases/php5-mssql/Makefile b/databases/php5-mssql/Makefile
index 3fdb36db6fb5..94f13b3de2ad 100644
--- a/databases/php5-mssql/Makefile
+++ b/databases/php5-mssql/Makefile
@@ -5,6 +5,7 @@
 # $FreeBSD$
 #
 
+PORTREVISION=	2
 CATEGORIES=	databases
 
 MASTERDIR=	${.CURDIR}/../../lang/php5
diff --git a/databases/php5-mssql/files/patch-php_mssql.c b/databases/php5-mssql/files/patch-php_mssql.c
new file mode 100644
index 000000000000..cd45e4f7acf9
--- /dev/null
+++ b/databases/php5-mssql/files/patch-php_mssql.c
@@ -0,0 +1,15 @@
+--- php_mssql.c	2004/12/06 19:45:57	1.137.2.6
++++ php_mssql.c	2004/12/16 21:49:36	1.137.2.7
+@@ -1196,10 +1196,8 @@ PHP_FUNCTION(mssql_query)
+ 	while ((num_fields = dbnumcols(mssql_ptr->link)) <= 0 && retvalue == SUCCEED) {
+ 		retvalue = dbresults(mssql_ptr->link);
+ 	}
+-	if (retvalue != SUCCEED) {
+-		RETURN_FALSE;
+-	}
+-	if ((num_fields = dbnumcols(mssql_ptr->link)) <= 0) {
++
++	if (num_fields <= 0) {
+ 		RETURN_TRUE;
+ 	}
+