diff --git a/tigervnc.changes b/tigervnc.changes
index fe6b8d3..b9915f3 100644
--- a/tigervnc.changes
+++ b/tigervnc.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Feb 13 14:29:47 UTC 2014 - msrb@suse.com
+
+- Readd vncpasswd.arg for compatibility with installation system
+  and potentially another users. (bnc#855246)
+
 -------------------------------------------------------------------
 Fri Feb  7 14:52:02 UTC 2014 - msrb@suse.com
 
diff --git a/tigervnc.spec b/tigervnc.spec
index adcd6a0..4fef697 100644
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@ -91,6 +91,7 @@ Source5:        vnc-server.firewall
 Source6:        vnc-httpd.firewall
 Source7:        vnc_inetd_httpd
 Source8:        vnc.reg
+Source9:        vncpasswd.arg
 
 # Tiger vnc patches
 Patch1:         u_tigervnc-1.3.0-fix-use-after-free.patch
@@ -197,6 +198,7 @@ install -D -m 644 %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/servi
 install -D -m 644 %{SOURCE6} $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services/vnc-httpd
 install -D -m 755 %{SOURCE7} $RPM_BUILD_ROOT%{_bindir}/vnc_inetd_httpd
 install -D -m 644 %{SOURCE8} $RPM_BUILD_ROOT/etc/slp.reg.d/vnc.reg
+install -D -m 755 %{SOURCE9} $RPM_BUILD_ROOT%{_bindir}/vncpasswd.arg
 
 %find_lang '%{name}'
 
@@ -214,6 +216,7 @@ install -D -m 644 %{SOURCE8} $RPM_BUILD_ROOT/etc/slp.reg.d/vnc.reg
 %{_bindir}/Xvnc
 %{_bindir}/vncconfig
 %{_bindir}/vncpasswd
+%{_bindir}/vncpasswd.arg
 %{_bindir}/vncserver
 %{_bindir}/x0vncserver
 %{_bindir}/vnc_inetd_httpd
diff --git a/vncpasswd.arg b/vncpasswd.arg
new file mode 100644
index 0000000..55c0434
--- /dev/null
+++ b/vncpasswd.arg
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# Compatibility replacement for vncpasswd.arg.
+
+if [ $# -ne 2 ]; then
+  echo "Usage: $0 file password"
+  exit 1
+fi
+
+echo "$2" | vncpasswd -f > "$1"