diff --git a/lib/krb5/cache.c b/lib/krb5/cache.c
index d805b4e39..03fd6e918 100644
--- a/lib/krb5/cache.c
+++ b/lib/krb5/cache.c
@@ -41,7 +41,7 @@
 RCSID("$Id$");
 
 krb5_error_code
-krb5_cc_register(krb5_context context, krb5_cc_ops *ops, int override)
+krb5_cc_register(krb5_context context, const krb5_cc_ops *ops, int override)
 {
     int i;
     if(context->cc_ops == NULL){
@@ -110,7 +110,7 @@ krb5_cc_resolve(krb5_context context,
 
 krb5_error_code
 krb5_cc_gen_new(krb5_context context,
-		krb5_cc_ops *ops,
+		const krb5_cc_ops *ops,
 		krb5_ccache *id)
 {
     krb5_ccache p;
@@ -118,7 +118,7 @@ krb5_cc_gen_new(krb5_context context,
     p = malloc (sizeof(*p));
     if (p == NULL)
 	return KRB5_CC_NOMEM;
-    p->ops = ops;
+    p->ops = (krb5_cc_ops *)ops;
     *id = p;
     return p->ops->gen_new(context, id);
 }
diff --git a/lib/krb5/fcache.c b/lib/krb5/fcache.c
index 6a85d2ea7..3c92afc35 100644
--- a/lib/krb5/fcache.c
+++ b/lib/krb5/fcache.c
@@ -365,7 +365,7 @@ fcc_set_flags(krb5_context context,
     return 0; /* XXX */
 }
 		    
-krb5_cc_ops krb5_fcc_ops = {
+const krb5_cc_ops krb5_fcc_ops = {
     "FILE",
     fcc_get_name,
     fcc_resolve,
diff --git a/lib/krb5/krb5.h b/lib/krb5/krb5.h
index c88149734..791ed2f71 100644
--- a/lib/krb5/krb5.h
+++ b/lib/krb5/krb5.h
@@ -411,8 +411,8 @@ typedef struct _krb5_verify_init_creds_opt {
 
 #define KRB5_VERIFY_INIT_CREDS_OPT_AP_REQ_NOFAIL	0x0001
 
-extern krb5_cc_ops krb5_fcc_ops;
-extern krb5_cc_ops krb5_mcc_ops;
+extern const krb5_cc_ops krb5_fcc_ops;
+extern const krb5_cc_ops krb5_mcc_ops;
 
 #define KRB5_KPASSWD_SUCCESS	0
 #define KRB5_KPASSWD_MALFORMED	0
diff --git a/lib/krb5/mcache.c b/lib/krb5/mcache.c
index ade4caf77..72d661ba1 100644
--- a/lib/krb5/mcache.c
+++ b/lib/krb5/mcache.c
@@ -211,7 +211,7 @@ mcc_set_flags(krb5_context context,
     return 0; /* XXX */
 }
 		    
-krb5_cc_ops krb5_mcc_ops = {
+const krb5_cc_ops krb5_mcc_ops = {
     "MEMORY",
     mcc_get_name,
     mcc_resolve,
diff --git a/lib/krb5/str2key.c b/lib/krb5/str2key.c
index 50cc98c95..48e6c4799 100644
--- a/lib/krb5/str2key.c
+++ b/lib/krb5/str2key.c
@@ -47,7 +47,7 @@ RCSID("$Id$");
 static void
 reverse (unsigned char *s)
 {
-     static unsigned char tbl[] = {
+     static const unsigned char tbl[] = {
 	  0x0,
 	  0x8,
 	  0x4,