diff --git a/CHANGES b/CHANGES
index 43b49c5ef2..af3a669dd2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+3189.	[test]		Added a summary report after system tests. [RT #25517]
+			
 3188.	[bug]		zone.c:zone_refreshkeys() could fail to detach
 			references correctly when errors occurred, causing
 			a hang on shutdown. [RT #26372]
diff --git a/bin/tests/system/.cvsignore b/bin/tests/system/.cvsignore
index b3271edb52..ea15748232 100644
--- a/bin/tests/system/.cvsignore
+++ b/bin/tests/system/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
 conf.sh
+systests.output
diff --git a/bin/tests/system/Makefile.in b/bin/tests/system/Makefile.in
index fc038eae06..8d46514380 100644
--- a/bin/tests/system/Makefile.in
+++ b/bin/tests/system/Makefile.in
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.37 2011/03/30 15:48:41 smann Exp $
+# $Id: Makefile.in,v 1.38 2011/11/01 18:35:53 each Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -36,6 +36,7 @@ test: subdirs
 
 testclean clean distclean::
 	if test -f ./cleanall.sh; then sh ./cleanall.sh; fi
+	rm -f systests.output
 
 distclean::
 	rm -f conf.sh
diff --git a/bin/tests/system/runall.sh b/bin/tests/system/runall.sh
index bf38cd7454..0c3228bbc9 100644
--- a/bin/tests/system/runall.sh
+++ b/bin/tests/system/runall.sh
@@ -15,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: runall.sh,v 1.10 2010/03/04 23:50:34 tbox Exp $
+# $Id: runall.sh,v 1.11 2011/11/01 18:35:53 each Exp $
 
 #
 # Run all the system tests.
@@ -26,13 +26,14 @@ SYSTEMTESTTOP=.
 
 status=0
 
-for d in $SUBDIRS
-do
-	sh run.sh $d || status=1
-done
+{
+    for d in $SUBDIRS
+    do
+            sh run.sh $d || status=1
+    done
 
-$PERL testsock.pl || {
-    cat <<EOF >&2
+    $PERL testsock.pl || {
+        cat <<EOF >&2
 I:
 I:NOTE: Many of the tests were skipped because they require that
 I:      the IP addresses 10.53.0.1 through 10.53.0.7 are configured 
@@ -40,7 +41,11 @@ I:	as alias addresses on the loopback interface.  Please run
 I:	"bin/tests/system/ifconfig.sh up" as root to configure them
 I:	and rerun the tests.
 EOF
-    exit 0;
-}
+        exit 0;
+    }
+} | tee "systests.output"
+
+echo "I:System test result summary:"
+grep '^R:' systests.output | sort | uniq -c | sed -e 's/^/I:   /' -e 's/R://'
 
 exit $status