diff --git a/src/builtin_functions.c b/src/builtin_functions.c
index a2e7ffd7120ff60f93c0b02b2e7cecc320a7de4b..a17bf733b290e6758a087e3351228429f7a0a7c6 100644
--- a/src/builtin_functions.c
+++ b/src/builtin_functions.c
@@ -4,7 +4,7 @@
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
 #include "global.h"
-RCSID("$Id: builtin_functions.c,v 1.112 1998/05/25 15:23:25 grubba Exp $");
+RCSID("$Id: builtin_functions.c,v 1.113 1998/06/07 19:44:46 grubba Exp $");
 #include "interpret.h"
 #include "svalue.h"
 #include "pike_macros.h"
@@ -822,6 +822,16 @@ void f_indices(INT32 args)
     a = program_indices(sp[-args].u.program);
     break;
 
+  case T_FUNCTION:
+    {
+      struct program *p = program_from_svalue(sp-args);
+      if (p) {
+	a = program_indices(p);
+	break;
+      }
+    }
+    /* FALL THROUGH */
+
   default:
     PIKE_ERROR("indices", "Bad argument 1.\n", sp, args);
     return; /* make apcc happy */
@@ -877,6 +887,16 @@ void f_values(INT32 args)
     a = program_values(sp[-args].u.program);
     break;
 
+  case T_FUNCTION:
+    {
+      struct program *p = program_from_svalue(sp - args);
+      if (p) {
+	a = program_values(p);
+	break;
+      }
+    }
+    /* FALL THROUGH */
+
   default:
     PIKE_ERROR("values", "Bad argument 1.\n", sp, args);
     return;  /* make apcc happy */