diff --git a/ChangeLog b/ChangeLog
index eac3bae1c..4e884af9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-06  Robert Larice
+ * src/frontend/inpcom.c :
+    Thank you Éric Larouche, for the report and fix of a bug concerning
+      the number of terminals of the current-controlled switch device
+    (`w' device) (committed at 2007-10-08)
+
 2010-11-06  Robert Larice
  * src/frontend/numparam/general.h ,
  * src/frontend/numparam/mystring.c ,
diff --git a/src/frontend/inpcom.c b/src/frontend/inpcom.c
index b9f3c49f3..e7c34e485 100644
--- a/src/frontend/inpcom.c
+++ b/src/frontend/inpcom.c
@@ -3049,10 +3049,10 @@ get_number_terminals( char *c )
 
   switch (*c) {
   case 'r': case 'c': case 'l': case 'k': case 'f': case 'h': case 'b':
-  case 'v': case 'i': case 'w': case 'd':
+  case 'v': case 'i': case 'd':
     return 2;
     break;
-  case 'u': case 'j': case 'z':
+  case 'u': case 'j': case 'w': case 'z':
     return 3;
     break;
   case 't': case 'o': case 'g': case 'e': case 's': case 'y':