diff --git a/packages/sysutils/busybox/install b/packages/sysutils/busybox/install
index 85f22b8a2b..20775565f2 100755
--- a/packages/sysutils/busybox/install
+++ b/packages/sysutils/busybox/install
@@ -39,6 +39,7 @@ USER_PWD="`$ROOT/$TOOLCHAIN/bin/cryptpw -m sha512 $USER_PASSWORD`"
     cp $PKG_DIR/scripts/createlog $INSTALL/usr/bin/
     cp $PKG_DIR/scripts/lsb_release $INSTALL/usr/bin/
     cp $PKG_DIR/scripts/apt-get $INSTALL/usr/bin/
+    cp $PKG_DIR/scripts/passwd $INSTALL/usr/bin/
     ln -sf /bin/busybox $INSTALL/usr/bin/env          #/usr/bin/env is needed for most python scripts
     cp $PKG_DIR/scripts/pastebinit $INSTALL/usr/bin/
     ln -sf pastebinit $INSTALL/usr/bin/paste
diff --git a/packages/sysutils/busybox/scripts/passwd b/packages/sysutils/busybox/scripts/passwd
new file mode 100755
index 0000000000..067f1fb280
--- /dev/null
+++ b/packages/sysutils/busybox/scripts/passwd
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+message="$message\n There is no working 'passwd'."
+message="$message\n"
+message="$message\n The 'passwd' command changes passwords for user accounts."
+message="$message\n"
+message="$message\n With OpenELEC it is not possible to change the system password"
+message="$message\n"
+message="$message\n SSH is included only as a last support resort. SSH is off by default."
+message="$message\n Most users never need SSH and need help using it so we need a default"
+message="$message\n password. If you need to keep SSH always on then this is unsupported"
+message="$message\n but can be secured with certificates."
+message="$message\n"
+message="$message\n TIP: disable password authentication in ssh and use public key authentication."
+
+echo -e $message