diff --git a/appl/push/push.c b/appl/push/push.c
index 7a9d99a99..95806b946 100644
--- a/appl/push/push.c
+++ b/appl/push/push.c
@@ -564,7 +564,7 @@ main(int argc, char **argv)
 	}
     }
     if (port == 0)
-	port = krb5_getportbyname ("kpop", "tcp", htons(1109));
+	port = krb5_getportbyname (context, "kpop", "tcp", 1109);
 
     parse_pobox (argv[0], argv[1],
 		 &host, &user, &filename);
diff --git a/appl/rsh/rsh.c b/appl/rsh/rsh.c
index 9a18158b3..32b542752 100644
--- a/appl/rsh/rsh.c
+++ b/appl/rsh/rsh.c
@@ -543,7 +543,7 @@ main(int argc, char **argv)
 	if (port)
 	    tmp_port = port;
 	else
-	    tmp_port = krb5_getportbyname ("kshell", "tcp", htons(544));
+	    tmp_port = krb5_getportbyname (context, "kshell", "tcp", 544);
 
 	auth_method = AUTH_KRB5;
 	ret = doit (*argv, user, tmp_port, argc - 1, argv + 1);
@@ -555,9 +555,9 @@ main(int argc, char **argv)
 	if (port)
 	    tmp_port = port;
 	else if (do_encrypt)
-	    tmp_port = k_getportbyname ("ekshell", "tcp", htons(545));
+	    tmp_port = krb5_getportbyname (context, "ekshell", "tcp", 545);
 	else
-	    tmp_port = krb5_getportbyname ("kshell", "tcp", htons(544));
+	    tmp_port = krb5_getportbyname (context, "kshell", "tcp", 544);
 
 	auth_method = AUTH_KRB4;
 	ret = doit (*argv, user, tmp_port, argc - 1, argv + 1);
diff --git a/appl/rsh/rshd.c b/appl/rsh/rshd.c
index ae36d9b1c..c646187b2 100644
--- a/appl/rsh/rshd.c
+++ b/appl/rsh/rshd.c
@@ -581,9 +581,9 @@ main(int argc, char **argv)
     if (inetd) {
 	if (port == 0)
 	    if (do_encrypt)
-		port = krb5_getportbyname ("ekshell", "tcp", htons(545));
+		port = krb5_getportbyname (context, "ekshell", "tcp", 545);
 	    else
-		port = krb5_getportbyname ("kshell",  "tcp", htons(544));
+		port = krb5_getportbyname (context, "kshell",  "tcp", 544);
 	mini_inetd (port);
     }
 
diff --git a/appl/telnet/telnetd/telnetd.c b/appl/telnet/telnetd/telnetd.c
index 0846707ed..c77b9b7e7 100644
--- a/appl/telnet/telnetd/telnetd.c
+++ b/appl/telnet/telnetd/telnetd.c
@@ -346,7 +346,7 @@ int main(int argc, char **argv)
 	    else
 		port = htons(atoi(*argv));
 	} else {
-	    port = krb5_getportbyname ("telnet", "tcp", htons(23));
+	    port = krb5_getportbyname (NULL, "telnet", "tcp", 23);
 	}
 	mini_inetd (port);
     } else if (argc > 0) {
diff --git a/kdc/hprop.c b/kdc/hprop.c
index 352ae6a75..d2f160e6d 100644
--- a/kdc/hprop.c
+++ b/kdc/hprop.c
@@ -45,7 +45,7 @@
 
 RCSID("$Id$");
 
-int open_socket(const char *hostname)
+int open_socket(krb5_context context, const char *hostname)
 {
     int s;
     struct hostent *hp;
@@ -63,7 +63,7 @@ int open_socket(const char *hostname)
     }
     memset(&sin, 0, sizeof(sin));
     sin.sin_family = AF_INET;
-    sin.sin_port = krb5_getportbyname ("hprop", "tcp", htons(HPROP_PORT));
+    sin.sin_port = krb5_getportbyname (context, "hprop", "tcp", HPROP_PORT);
     memcpy(&sin.sin_addr, hp->h_addr, hp->h_length);
     if(connect(s, (struct sockaddr*)&sin, sizeof(sin)) < 0){
 	warn("connect");
@@ -129,7 +129,7 @@ conv_db(void *arg, Principal *p)
 	unsigned char *key = ent.keys.val[0].key.keyvalue.data;
 	memcpy(key, &p->key_low, 4);
 	memcpy(key + 4, &p->key_high, 4);
-	kdb_encrypt_key(key, key, &mkey, msched, 0);
+	kdb_encrypt_key((des_cblock*)key, (des_cblock*)key, &mkey, msched, 0);
     }
     hdb_seal_key(&ent.keys.val[0], msched);
 
@@ -280,7 +280,7 @@ int main(int argc, char **argv)
     
 
     for(i = optind; i < argc; i++){
-	fd = open_socket(argv[i]);
+	fd = open_socket(context, argv[i]);
 	if(fd < 0)
 	    continue;
 
diff --git a/kpasswd/kpasswdd.c b/kpasswd/kpasswdd.c
index 308cec7df..13d566d2b 100644
--- a/kpasswd/kpasswdd.c
+++ b/kpasswd/kpasswdd.c
@@ -564,5 +564,5 @@ main (int argc, char **argv)
 
     signal (SIGINT, sigterm);
 
-    return doit (krb5_getportbyname ("kpasswd", "udp", htons(KPASSWD_PORT)));
+    return doit (krb5_getportbyname (context, "kpasswd", "udp", KPASSWD_PORT));
 }