diff --git a/mariadb-admincrash.patch b/mariadb-admincrash.patch
new file mode 100644
index 0000000..31cbe39
--- /dev/null
+++ b/mariadb-admincrash.patch
@@ -0,0 +1,24 @@
+mysqladmin crash on execution of below command:
+
+  #> mysqladmin -u root -p
+  ...
+  Segmentation fault (core dumped)
+
+This is probably caused by memory corruption based on working with temp_argv[-1].
+
+RHBZ: #1207041
+Upstream report: https://mariadb.atlassian.net/browse/MDEV-7883
+
+diff -up mariadb-5.5.41/client/mysqladmin.cc.bz1207041 mariadb-5.5.41/client/mysqladmin.cc
+--- mariadb-5.5.41/client/mysqladmin.cc.bz1207041	2015-03-30 12:37:31.078880914 +0200
++++ mariadb-5.5.41/client/mysqladmin.cc	2015-03-30 13:03:32.442152833 +0200
+@@ -1215,7 +1215,8 @@ static char **mask_password(int argc, ch
+      }
+     argc--;
+   }
+-  temp_argv[argc]= my_strdup((*argv)[argc], MYF(MY_FAE));
++  if (argc >= 0)
++    temp_argv[argc]= my_strdup((*argv)[argc], MYF(MY_FAE));
+   return(temp_argv);
+ }
+ 
diff --git a/mariadb.spec b/mariadb.spec
index 50db6f7..7cccd49 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -159,6 +159,7 @@ Patch6:           %{pkgnamepatch}-dh1024.patch
 Patch7:           %{pkgnamepatch}-scripts.patch
 Patch8:           %{pkgnamepatch}-install-db-sharedir.patch
 Patch9:           %{pkgnamepatch}-ownsetup.patch
+Patch12:          %{pkgnamepatch}-admincrash.patch
 
 # Patches specific for this mysql package
 Patch30:          %{pkgnamepatch}-errno.patch
@@ -499,6 +500,7 @@ MariaDB is a community developed branch of MySQL.
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch12 -p1
 %patch30 -p1
 %patch31 -p1
 %patch32 -p1
@@ -1162,6 +1164,8 @@ fi
   Related: #1189180
 - Fail in case any command in check fails
   Related: #1124791
+- Fix mysqladmin crash if run with -u root -p
+  Resolves: #1207170
 
 * Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 1:10.0.17-3
 - Rebuilt for GCC 5 C++11 ABI change