diff --git a/zpasswd.py b/zpasswd.py
index f6284c619bd9ba8d7033351e154ce4c72d9130a2..afabc1d821a2ea93fb389b0518019fb3bbb84020 100644
--- a/zpasswd.py
+++ b/zpasswd.py
@@ -85,7 +85,7 @@
 ##############################################################################
 """Zope password change system"""
 
-__version__='$Revision: 1.6 $ '[11:-2]
+__version__='$Revision: 1.7 $ '[11:-2]
 
 import sys, string, sha, binascii, whrandom, getopt, getpass, os
 
@@ -102,6 +102,7 @@ def generate_salt():
     return whrandom.choice(salt_choices)
 
 def generate_passwd(password, encoding):
+    encoding=string.upper(encoding)
     if encoding == 'SHA':
         pw = '{SHA}' + binascii.b2a_base64(sha.new(password).digest())[:-1]
     elif encoding == 'CRYPT':