diff --git a/frontends/command-line/interface.c b/frontends/command-line/interface.c
index a51bde243..79f3d28ee 100644
--- a/frontends/command-line/interface.c
+++ b/frontends/command-line/interface.c
@@ -18,13 +18,13 @@ status_func (Camera *camera, const char *status, void *data)
 		printf ("Status: %s\n", status);
 }
 
-int gp_interface_message (Camera *camera, char *message) {
-
+void
+message_func (Camera *camera, const char *message, void *data)
+{
 	if (glob_quiet)
-		return (GP_OK);
+		return;
 
-	printf("Message: %s\n", message);
-	return (GP_OK);
+	printf ("Message: %s\n", message);
 }
 
 int gp_interface_confirm (Camera *camera, char *message) {
diff --git a/frontends/command-line/interface.h b/frontends/command-line/interface.h
index 0830899f9..70a4b2c41 100644
--- a/frontends/command-line/interface.h
+++ b/frontends/command-line/interface.h
@@ -1,4 +1,5 @@
 void status_func (Camera *camera, const char *status, void *data);
 void progress_func (Camera *camera, float percentage, void *data);
-int gp_interface_message (Camera *camera, char *message);
+void message_func (Camera *camera, const char *message, void *data);
+
 int gp_interface_confirm (Camera *camera, char *message);
diff --git a/frontends/command-line/main.c b/frontends/command-line/main.c
index 2caaebc22..7db87e737 100644
--- a/frontends/command-line/main.c
+++ b/frontends/command-line/main.c
@@ -832,6 +832,7 @@ set_globals (void)
 
 	gp_camera_set_status_func (glob_camera, status_func, NULL);
 	gp_camera_set_progress_func (glob_camera, progress_func, NULL);
+	gp_camera_set_message_func (glob_camera, message_func, NULL);
 
         cli_debug_print ("Initializing camera...");
         CHECK_RESULT (gp_camera_init (glob_camera));
@@ -967,8 +968,7 @@ e.g. SET IOLIBS=C:\\GPHOTO2\\IOLIB\n");
                 exit(EXIT_FAILURE);
         }
 
-        gp_frontend_register (NULL, NULL, gp_interface_message,
-			      gp_interface_confirm, NULL);
+        gp_frontend_register (NULL, NULL, NULL, gp_interface_confirm, NULL);
         if ((result = execute_options(argc, argv)) != GP_OK) {
                 printf ("gPhoto2 reported the error '%s'\n",
                         gp_camera_get_result_as_string (glob_camera, result));