diff --git a/c/mapping/Makefile.in b/c/mapping/Makefile.in
index e48c4d12a..044183aa5 100644
--- a/c/mapping/Makefile.in
+++ b/c/mapping/Makefile.in
@@ -106,11 +106,11 @@ libmapping_la_DEPENDENCIES = ../lib/libmlr.la ../cli/libcli.la \
 	../input/libinput.la
 am_libmapping_la_OBJECTS = mapper_altkv.lo mapper_bar.lo \
 	mapper_bootstrap.lo mapper_cat.lo mapper_check.lo \
-	mapper_clean_whitespace.lo mapper_count_similar.lo \
-	mapper_cut.lo mapper_decimate.lo mapper_fill_down.lo \
-	mapper_grep.lo mapper_group_like.lo mapper_having_fields.lo \
-	mapper_head.lo mapper_histogram.lo mapper_join.lo \
-	mapper_label.lo mapper_merge_fields.lo \
+	mapper_clean_whitespace.lo mapper_count.lo \
+	mapper_count_similar.lo mapper_cut.lo mapper_decimate.lo \
+	mapper_fill_down.lo mapper_grep.lo mapper_group_like.lo \
+	mapper_having_fields.lo mapper_head.lo mapper_histogram.lo \
+	mapper_join.lo mapper_label.lo mapper_merge_fields.lo \
 	mapper_most_or_least_frequent.lo mapper_nest.lo \
 	mapper_nothing.lo mapper_format_values.lo mapper_fraction.lo \
 	mapper_put_or_filter.lo mapper_regularize.lo \
@@ -319,6 +319,7 @@ libmapping_la_SOURCES = \
 			mapper_cat.c \
 			mapper_check.c \
 			mapper_clean_whitespace.c \
+			mapper_count.c \
 			mapper_count_similar.c \
 			mapper_cut.c \
 			mapper_decimate.c \
@@ -435,6 +436,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mapper_cat.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mapper_check.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mapper_clean_whitespace.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mapper_count.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mapper_count_similar.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mapper_cut.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mapper_decimate.Plo@am__quote@
diff --git a/c/mlrvers.h b/c/mlrvers.h
index d59cfde25..c17c9bbba 100644
--- a/c/mlrvers.h
+++ b/c/mlrvers.h
@@ -1,5 +1,5 @@
 #ifndef MLRVERS_H
 #define MLRVERS_H
 // Manually increment on updates to https://github.com/johnkerl/miller/releases
-#define MLR_VERSION "v5.7.0-dev"
+#define MLR_VERSION "v5.8.0"
 #endif // MLRVERS_H
diff --git a/configure b/configure
index 80d05e836..541e9da11 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for mlr 5.7.0.
+# Generated by GNU Autoconf 2.69 for mlr 5.8.0.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='mlr'
 PACKAGE_TARNAME='mlr'
-PACKAGE_VERSION='5.7.0'
-PACKAGE_STRING='mlr 5.7.0'
+PACKAGE_VERSION='5.8.0'
+PACKAGE_STRING='mlr 5.8.0'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1324,7 +1324,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures mlr 5.7.0 to adapt to many kinds of systems.
+\`configure' configures mlr 5.8.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1395,7 +1395,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of mlr 5.7.0:";;
+     short | recursive ) echo "Configuration of mlr 5.8.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1505,7 +1505,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-mlr configure 5.7.0
+mlr configure 5.8.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1783,7 +1783,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by mlr $as_me 5.7.0, which was
+It was created by mlr $as_me 5.8.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2650,7 +2650,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='mlr'
- VERSION='5.7.0'
+ VERSION='5.8.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12742,7 +12742,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by mlr $as_me 5.7.0, which was
+This file was extended by mlr $as_me 5.8.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -12812,7 +12812,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-mlr config.status 5.7.0
+mlr config.status 5.8.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 4a60d7b3a..ddec1e14c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.60])
 # Manually increment on updates to https://github.com/johnkerl/miller/releases
-AC_INIT([mlr],[5.7.0-dev])
+AC_INIT([mlr],[5.8.0])
 AC_CONFIG_SRCDIR([c/mlrmain.c])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_AUX_DIR([autotools])
diff --git a/miller.spec b/miller.spec
index e48bac209..d90b4e4f4 100644
--- a/miller.spec
+++ b/miller.spec
@@ -1,6 +1,6 @@
 Summary: Name-indexed data processing tool
 Name: miller
-Version: 5.7.0
+Version: 5.8.0
 Release: 1%{?dist}
 License: BSD
 Source: https://github.com/johnkerl/miller/releases/download/%{version}/mlr-%{version}.tar.gz
@@ -35,6 +35,9 @@ make check
 %{_mandir}/man1/mlr.1*
 
 %changelog
+* Sun May 17 2020 John Kerl <kerl.john.r@gmail.com> - 5.8.0-1
+- 5.8.0 release
+
 * Mon Mar 16 2020 John Kerl <kerl.john.r@gmail.com> - 5.7.0-1
 - 5.7.0 release