1 files changed, 6 insertions, 1 deletions
diff --git a/ipa b/ipa
index 67e8d10c4..cab12b6ba 100755
--- a/ipa
+++ b/ipa
@@ -30,7 +30,12 @@ from ipalib import api
 from ipalib.cli import CLI
 
 if __name__ == '__main__':
+    # If we can't explicitly determin the encoding, we assume UTF-8:
+    if sys.stdin.encoding is None:
+        encoding = 'UTF-8'
+    else:
+        encoding = sys.stdin.encoding
     cli = CLI(api,
-        (s.decode('utf-8') for s in sys.argv[1:])
+        (s.decode(encoding) for s in sys.argv[1:])
     )
     sys.exit(cli.run())