diff --git a/tsm-client/files/dsmcert b/tsm-client/files/dsmcert
new file mode 100755
index 0000000000000000000000000000000000000000..8f022b635609cd94b37f58dae06bcc67fc6e1105
--- /dev/null
+++ b/tsm-client/files/dsmcert
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+export LD_LIBRARY_PATH="/opt/tivoli/tsm/client/ba/bin:/opt/tivoli/tsm/client/api/bin:/opt/tivoli/tsm/client/api/bin64/:/usr/local/ibm/gsk8/lib/:/usr/local/ibm/gsk8_64/lib64/:"
+export LANG="en_US.utf-8"
+export LC_CTYPE="en_US.utf-8" 
+
+exec /usr/bin/dsmcert "$@"
diff --git a/tsm-client/tasks/main.yml b/tsm-client/tasks/main.yml
index 48afba9b72cb07b8388c5092f497f94de091bb61..58a03ed41b2366870e7ad40ba874bf7f0ffc1c88 100644
--- a/tsm-client/tasks/main.yml
+++ b/tsm-client/tasks/main.yml
@@ -48,10 +48,16 @@
     - tsm
     - config
 
+- name: ensure special dsmcert script is in place
+  copy: src=dsmcert dest=/usr/local/bin/dsmcert mode=0755 owner=root group=root
+  tags:
+    - tsm
+    - config
+
 - name: ensure tls anchor certificate is configured
   command: dsmcert -add -server "T-TeleSec GlobalRoot Class 2" -file /etc/ssl/certs/T-TeleSec_GlobalRoot_Class_2.pem
   args:
-    creates: IBM/SpectrumProtect/certs/dsmcert.sth
+    creates: /opt/tivoli/tsm/client/ba/bin/dsmcert.kdb
   tags:
     - tsm
     - config