diff --git a/CHANGES b/CHANGES
index 18f4f48381cf087ea7fea126741bd29ccf89eaca..be75d9f50253129fed588bccfced6a09a41e649f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,9 @@
 
  Changes between 0.9.1c and 0.9.2
 
+  *) Sort openssl functions by name.
+     [Ben Laurie]
+
   *) Get the gendsa program working (hopefully) and add it to app list. Remove
      encryption from sample DSA keys (in case anyone is interested the password
      was "1234").
diff --git a/apps/openssl.c b/apps/openssl.c
index e4bf362fa0bd1b12d0b82f0924caecc95b2c6b67..dfa23d674e4ed157f5ab0bb578f06958b4ef6884 100644
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -318,10 +318,26 @@ end:
 	return(ret);
 	}
 
+static int SortFnByName(const void *_f1,const void *_f2)
+    {
+    const FUNCTION *f1=_f1;
+    const FUNCTION *f2=_f2;
+
+    if(f1->type != f2->type)
+	return f1->type-f2->type;
+    return strcmp(f1->name,f2->name);
+    }
+
 static LHASH *prog_init()
 	{
 	LHASH *ret;
 	FUNCTION *f;
+	int i;
+
+	/* Purely so it looks nice when the user hits ? */
+	for(i=0,f=functions ; f->name != NULL ; ++f,++i)
+	    ;
+	qsort(functions,i,sizeof *functions,SortFnByName);
 
 	if ((ret=lh_new(hash,cmp)) == NULL) return(NULL);