diff --git a/src/Input/js_demo.cxx b/src/Input/js_demo.cxx
index 904a4097d..cdce31427 100644
--- a/src/Input/js_demo.cxx
+++ b/src/Input/js_demo.cxx
@@ -26,9 +26,12 @@ int main ( int, char ** )
   t = 0;
   for ( i = 0; i < Z; i++ )
   { useful[i] = ! ( js[i]->notWorking () );
-    if ( useful[i] )
+    if ( useful[i] ) {
          t++;
-    else printf ( "Joystick %i not detected\n", i ) ;
+#ifdef FG_PLIB_JOYSTICK_GETNAME
+         printf ( "Joystick %i: \"%s\"\n", i, js[i]->getName() ) ;
+#endif
+    } else printf ( "Joystick %i not detected\n", i ) ;
   }
   if ( t == 0 ) exit ( 1 ) ;