diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh
index 733dd4ef3e6..789f3e3ce2e 100644
--- a/scripts/make_binary_distribution.sh
+++ b/scripts/make_binary_distribution.sh
@@ -169,6 +169,7 @@ esac
 VERSION_NAME=@VERSION@
 case $VERSION_NAME in
   *-ndb-* )  VERSION_NAME=`echo $VERSION_NAME | sed -e 's/[.0-9]*-ndb-//'` ;;
+  *-MariaDB-* ) VERSION_NAME=`echo $VERSION_NAME | sed -e 's/-MariaDB//'` ;;
 esac
 if [ x"$SHORT_PRODUCT_TAG" != x"" ] ; then
   NEW_NAME=mariadb-$SHORT_PRODUCT_TAG-$VERSION_NAME-$PLATFORM$SUFFIX
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 8a476383d82..1cd4ac182f5 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -2685,6 +2685,8 @@ or misconfigured. This error can also be caused by malfunctioning hardware.\n",
 We will try our best to scrape up some info that will hopefully help diagnose\n\
 the problem, but since we have already crashed, something is definitely wrong\n\
 and this may fail.\n\n");
+  set_server_version();
+  fprintf(stderr, "Server version: %s\n", server_version);
   fprintf(stderr, "key_buffer_size=%lu\n",
           (ulong) dflt_key_cache->key_cache_mem_size);
   fprintf(stderr, "read_buffer_size=%ld\n", (long) global_system_variables.read_buff_size);