diff --git a/utils/GPSsmooth/UGear_telnet.cxx b/utils/GPSsmooth/UGear_telnet.cxx
index a65c2067e..6bd26e79a 100644
--- a/utils/GPSsmooth/UGear_telnet.cxx
+++ b/utils/GPSsmooth/UGear_telnet.cxx
@@ -194,7 +194,8 @@ UGTelnet::open()
     printf("Telnet server started on port %d\n", port );
 
     enabled = true;
-
+    poller.addChannel(this);
+    
     return true;
 }
 
@@ -214,7 +215,7 @@ UGTelnet::close()
 bool
 UGTelnet::process()
 {
-    simgear::NetChannel::poll();
+    poller.poll();
     return true;
 }
 
@@ -230,4 +231,5 @@ UGTelnet::handleAccept()
            addr.getHost(), addr.getPort() );
     PropsChannel* channel = new PropsChannel();
     channel->setHandle( handle );
+    poller.addChannel(channel);
 }
diff --git a/utils/GPSsmooth/UGear_telnet.hxx b/utils/GPSsmooth/UGear_telnet.hxx
index 15e88633e..74ecfc5a7 100644
--- a/utils/GPSsmooth/UGear_telnet.hxx
+++ b/utils/GPSsmooth/UGear_telnet.hxx
@@ -51,7 +51,7 @@ private:
      */
     int port;
     bool enabled;
-
+    simgear::NetChannelPoller poller;
 public:
 
     /**