diff --git a/ChangeLog b/ChangeLog
index a9d55b175b..de6c53e52b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-11  Sven Neumann  <sven@gimp.org>
+
+	* modules/gimpinputdevicestore.c: don't limit the store to
+	"input.mouse", list all input devices.
+
 2007-02-11  Sven Neumann  <sven@gimp.org>
 
 	* configure.in: check for libhal if Linux Input support is enabled.
diff --git a/modules/gimpinputdevicestore.c b/modules/gimpinputdevicestore.c
index 574f9fe629..31bb5a2828 100644
--- a/modules/gimpinputdevicestore.c
+++ b/modules/gimpinputdevicestore.c
@@ -110,7 +110,7 @@ gimp_input_device_store_init (GimpInputDeviceStore *store)
       char **devices;
       int    i, num_devices;
 
-      devices = libhal_find_device_by_capability (store->context, "input.mouse",
+      devices = libhal_find_device_by_capability (store->context, "input",
                                                   &num_devices, NULL);
 
       for (i = 0; i < num_devices; i++)
@@ -187,7 +187,7 @@ gimp_input_device_store_add (GimpInputDeviceStore *store,
     {
       char *str;
 
-      if (strcmp (caps[i], "input.mouse"))
+      if (strcmp (caps[i], "input"))
         continue;
 
       str = libhal_device_get_property_string (store->context,
@@ -260,7 +260,7 @@ gimp_input_device_store_get_device_file (GimpInputDeviceStore *store,
   if (gimp_input_device_store_lookup (store, &iter, udi))
     {
       char *str = libhal_device_get_property_string (store->context,
-                                                     udi, "linux.device_file",
+                                                     udi, "input.device",
                                                      NULL);
 
       if (str)