diff --git a/.gitignore b/.gitignore
index d7b19b0..6496f12 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,6 +42,7 @@ src/libsample/libsample.a
 src/libsamplerate/libsamplerate.a
 src/libfilter/libfilter.a
 src/libtimer/libtimer.a
+src/libselect/libselect.a
 src/libsound/libsound.a
 src/telephone/osmo-cc-alsa-endpoint
 
diff --git a/configure.ac b/configure.ac
index 8fb32f4..144d722 100644
--- a/configure.ac
+++ b/configure.ac
@@ -89,6 +89,7 @@ AC_OUTPUT(
 	src/libsamplerate/Makefile
 	src/libfilter/Makefile
 	src/libtimer/Makefile
+	src/libselect/Makefile
 	src/libjitter/Makefile
 	src/libosmocc/Makefile
 	src/libg711/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 761af8d..f3a48f1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,6 +7,7 @@ SUBDIRS = \
 	libsamplerate \
 	libfilter \
 	libtimer \
+	libselect \
 	libjitter \
 	libosmocc \
 	libg711
diff --git a/src/telephone/Makefile.am b/src/telephone/Makefile.am
index e850614..a9c24a2 100644
--- a/src/telephone/Makefile.am
+++ b/src/telephone/Makefile.am
@@ -14,9 +14,10 @@ osmo_cc_alsa_endpoint_LDADD = \
 	../libsample/libsample.a \
 	../libsamplerate/libsamplerate.a \
 	../libfilter/libfilter.a \
-	../libtimer/libtimer.a \
-	../libjitter/libjitter.a \
 	../libosmocc/libosmocc.a \
+	../libtimer/libtimer.a \
+	../libselect/libselect.a \
+	../libjitter/libjitter.a \
 	../libg711/libg711.a \
 	-lm
 
diff --git a/src/telephone/main.c b/src/telephone/main.c
index 85d0822..1e1d5a0 100644
--- a/src/telephone/main.c
+++ b/src/telephone/main.c
@@ -292,7 +292,6 @@ int main(int argc, char *argv[])
 		}
 		process_timer();
 		alsa_work(telephone_ep);
-		rtp_work(telephone_ep);
 		do {
 			w = 0;
 			w |= osmo_cc_handle();
diff --git a/src/telephone/telephone.c b/src/telephone/telephone.c
index b2b6cb1..063f94c 100644
--- a/src/telephone/telephone.c
+++ b/src/telephone/telephone.c
@@ -363,18 +363,6 @@ void alsa_work(telephone_t *telephone_ep)
 #endif
 }
 
-void rtp_work(telephone_t *telephone_ep)
-{
-	call_t *call;
-
-	call = telephone_ep->call_list;
-	while (call) {
-		if (call->cc_session)
-			osmo_cc_session_handle(call->cc_session, call);
-		call = call->next;
-	}
-}
-
 
 /*
  * handle message from CC
diff --git a/src/telephone/telephone.h b/src/telephone/telephone.h
index e94a625..354b981 100644
--- a/src/telephone/telephone.h
+++ b/src/telephone/telephone.h
@@ -1,5 +1,6 @@
 
 #include "../libtimer/timer.h"
+#include "../libselect/select.h"
 #include "../libosmocc/endpoint.h"
 #include "../libsample/sample.h"
 #include "../libsamplerate/samplerate.h"
@@ -72,5 +73,4 @@ void cc_message(osmo_cc_endpoint_t *ep, uint32_t callref, osmo_cc_msg_t *msg);
 int ui_init(const char *remote_id, int autoalert, int autoanswer);
 int ui_work(telephone_t *telephone_ep, int c);
 void alsa_work(telephone_t *telephone_ep);
-void rtp_work(telephone_t *telephone_ep);