diff --git a/pkg/kamailio/deb/debian/backports/jessie b/pkg/kamailio/deb/debian/backports/jessie
index 80cd6a65c74..cba77a58245 100755
--- a/pkg/kamailio/deb/debian/backports/jessie
+++ b/pkg/kamailio/deb/debian/backports/jessie
@@ -14,6 +14,10 @@ sed -i -e '/libxmlrpc-c3-dev/d' -e '/^Package: kamailio-xmlrpc-modules/,/^$/d' \
 sed -i -e 's/ mi_xmlrpc[ ,$]*/ /' ${DIST}/rules
 sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ mi_xmlrpc/' ${DIST}/rules
 
+# use old libfreeradius
+sed -i 's/libradcli-dev/libfreeradius-client-dev/' ${DIST}/control
+sed -i -e 's/RADCLI/FREERADIUS/' ${DIST}/rules
+
 # clean backports scripts
 rm -rf ${DIST}/backports
 exit 0
diff --git a/pkg/kamailio/deb/debian/backports/precise b/pkg/kamailio/deb/debian/backports/precise
index 8caca988163..8743d589dad 100755
--- a/pkg/kamailio/deb/debian/backports/precise
+++ b/pkg/kamailio/deb/debian/backports/precise
@@ -26,8 +26,8 @@ sed -i -e 's/ dnssec[ ,$]*/ /' ${DIST}/rules
 sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ dnssec/' ${DIST}/rules
 
 # use old radius-client-ng
-sed -i 's/libfreeradius-client-dev/libradiusclient-ng-dev/' ${DIST}/control
-sed -i -e '/FREERADIUS/d' ${DIST}/rules
+sed -i 's/libradcli-dev/libradiusclient-ng-dev/' ${DIST}/control
+sed -i -e '/RADCLI/d' ${DIST}/rules
 
 # use old json
 sed -i 's/libjson-c-dev/libjson0-dev/' ${DIST}/control
diff --git a/pkg/kamailio/deb/debian/backports/squeeze b/pkg/kamailio/deb/debian/backports/squeeze
index b20c2c9df2d..13542817d12 100755
--- a/pkg/kamailio/deb/debian/backports/squeeze
+++ b/pkg/kamailio/deb/debian/backports/squeeze
@@ -72,8 +72,8 @@ sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ mono/' ${DIST}/rules
 sed -i -e 's/db-util/db4.8-util/' ${DIST}/control
 
 # use old radius-client-ng
-sed -i 's/libfreeradius-client-dev/libradiusclient-ng-dev/' ${DIST}/control
-sed -i -e '/FREERADIUS/d' ${DIST}/rules
+sed -i 's/libradcli-dev/libradiusclient-ng-dev/' ${DIST}/control
+sed -i -e '/RADCLI/d' ${DIST}/rules
 
 # use old json
 sed -i 's/libjson-c-dev/libjson0-dev/' ${DIST}/control
diff --git a/pkg/kamailio/deb/debian/backports/trusty b/pkg/kamailio/deb/debian/backports/trusty
index 17065d8b957..6c05bc19ecf 100755
--- a/pkg/kamailio/deb/debian/backports/trusty
+++ b/pkg/kamailio/deb/debian/backports/trusty
@@ -19,6 +19,10 @@ sed -i -e '/libxmlrpc-c3-dev/d' -e '/^Package: kamailio-xmlrpc-modules/,/^$/d' \
 sed -i -e 's/ mi_xmlrpc[ ,$]*/ /' ${DIST}/rules
 sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ mi_xmlrpc/' ${DIST}/rules
 
+# use old libfreeradius
+sed -i 's/libradcli-dev/libfreeradius-client-dev/' ${DIST}/control
+sed -i -e 's/RADCLI/FREERADIUS/' ${DIST}/rules
+
 # clean backports scripts
 rm -rf ${DIST}/backports
 exit 0
diff --git a/pkg/kamailio/deb/debian/backports/wheezy b/pkg/kamailio/deb/debian/backports/wheezy
index 797512e38a4..c09abd5caf0 100755
--- a/pkg/kamailio/deb/debian/backports/wheezy
+++ b/pkg/kamailio/deb/debian/backports/wheezy
@@ -32,8 +32,8 @@ sed -i -e 's/ dnssec[ ,$]*/ /' ${DIST}/rules
 sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ dnssec/' ${DIST}/rules
 
 # use old radius-client-ng
-sed -i 's/libfreeradius-client-dev/libradiusclient-ng-dev/' ${DIST}/control
-sed -i -e '/FREERADIUS/d' ${DIST}/rules
+sed -i 's/libradcli-dev/libradiusclient-ng-dev/' ${DIST}/control
+sed -i -e '/RADCLI/d' ${DIST}/rules
 
 # use old json
 sed -i 's/libjson-c-dev/libjson0-dev/' ${DIST}/control
diff --git a/pkg/kamailio/deb/debian/control b/pkg/kamailio/deb/debian/control
index a702956bfdb..4fa77aecee0 100644
--- a/pkg/kamailio/deb/debian/control
+++ b/pkg/kamailio/deb/debian/control
@@ -18,7 +18,6 @@ Build-Depends: bison,
                libev-dev,
                libevent-dev,
                libexpat1-dev,
-               libfreeradius-client-dev,
                libgeoip-dev (>= 1.4.5),
                libhiredis-dev (>= 0.10.0),
                libjansson-dev,
@@ -34,6 +33,7 @@ Build-Depends: bison,
                libpq-dev,
                libpurple-dev,
                librabbitmq-dev,
+               libradcli-dev,
                libreadline-dev,
                libsasl2-dev,
                libsctp-dev,
diff --git a/pkg/kamailio/deb/debian/kamailio.examples b/pkg/kamailio/deb/debian/kamailio.examples
index c48447a3e9c..e39721e20f0 100644
--- a/pkg/kamailio/deb/debian/kamailio.examples
+++ b/pkg/kamailio/deb/debian/kamailio.examples
@@ -1,2 +1 @@
 examples/*
-
diff --git a/pkg/kamailio/deb/debian/rules b/pkg/kamailio/deb/debian/rules
index b2301e04f6b..1d4c6de685e 100755
--- a/pkg/kamailio/deb/debian/rules
+++ b/pkg/kamailio/deb/debian/rules
@@ -19,9 +19,7 @@ include /usr/share/dpkg/buildflags.mk
 #export DH_VERBOSE=1
 
 export JAVA_HOME=/usr/lib/jvm/java-gcj
-
-# choose freeradius
-export FREERADIUS=1
+export RADCLI=1
 
 # modules not in the "main" kamailio package
 EXCLUDED_MODULES=
diff --git a/pkg/kamailio/deb/jessie/control b/pkg/kamailio/deb/jessie/control
index 84e5d4a4b4f..084a4642ea9 100644
--- a/pkg/kamailio/deb/jessie/control
+++ b/pkg/kamailio/deb/jessie/control
@@ -18,7 +18,6 @@ Build-Depends: bison,
                libev-dev,
                libevent-dev,
                libexpat1-dev,
-               libfreeradius-client-dev,
                libgeoip-dev (>= 1.4.5),
                libhiredis-dev (>= 0.10.0),
                libjansson-dev,
@@ -34,6 +33,7 @@ Build-Depends: bison,
                libpq-dev,
                libpurple-dev,
                librabbitmq-dev,
+               libfreeradius-client-dev,
                libreadline-dev,
                libsasl2-dev,
                libsctp-dev,
diff --git a/pkg/kamailio/deb/jessie/kamailio.examples b/pkg/kamailio/deb/jessie/kamailio.examples
index c48447a3e9c..e39721e20f0 100644
--- a/pkg/kamailio/deb/jessie/kamailio.examples
+++ b/pkg/kamailio/deb/jessie/kamailio.examples
@@ -1,2 +1 @@
 examples/*
-
diff --git a/pkg/kamailio/deb/jessie/rules b/pkg/kamailio/deb/jessie/rules
index 4cee767872d..4e0182a8db6 100755
--- a/pkg/kamailio/deb/jessie/rules
+++ b/pkg/kamailio/deb/jessie/rules
@@ -19,8 +19,6 @@ include /usr/share/dpkg/buildflags.mk
 #export DH_VERBOSE=1
 
 export JAVA_HOME=/usr/lib/jvm/java-gcj
-
-# choose freeradius
 export FREERADIUS=1
 
 # modules not in the "main" kamailio package
diff --git a/pkg/kamailio/deb/precise/control b/pkg/kamailio/deb/precise/control
index e2bddc4557a..589aba59119 100644
--- a/pkg/kamailio/deb/precise/control
+++ b/pkg/kamailio/deb/precise/control
@@ -17,7 +17,6 @@ Build-Depends: bison,
                libev-dev,
                libevent-dev,
                libexpat1-dev,
-               libradiusclient-ng-dev,
                libgeoip-dev (>= 1.4.5),
                libhiredis-dev (>= 0.10.0),
                libjansson-dev,
@@ -32,6 +31,7 @@ Build-Depends: bison,
                libperl-dev,
                libpq-dev,
                libpurple-dev,
+               libradiusclient-ng-dev,
                libreadline-dev,
                libsasl2-dev,
                libsctp-dev,
diff --git a/pkg/kamailio/deb/precise/kamailio.examples b/pkg/kamailio/deb/precise/kamailio.examples
index c48447a3e9c..e39721e20f0 100644
--- a/pkg/kamailio/deb/precise/kamailio.examples
+++ b/pkg/kamailio/deb/precise/kamailio.examples
@@ -1,2 +1 @@
 examples/*
-
diff --git a/pkg/kamailio/deb/precise/rules b/pkg/kamailio/deb/precise/rules
index 579c1b55432..437d954e879 100755
--- a/pkg/kamailio/deb/precise/rules
+++ b/pkg/kamailio/deb/precise/rules
@@ -20,8 +20,6 @@ include /usr/share/dpkg/buildflags.mk
 
 export JAVA_HOME=/usr/lib/jvm/java-gcj
 
-# choose freeradius
-
 # modules not in the "main" kamailio package
 EXCLUDED_MODULES=
 
diff --git a/pkg/kamailio/deb/sid/control b/pkg/kamailio/deb/sid/control
index 84e5d4a4b4f..6df63a53a6e 100644
--- a/pkg/kamailio/deb/sid/control
+++ b/pkg/kamailio/deb/sid/control
@@ -18,7 +18,6 @@ Build-Depends: bison,
                libev-dev,
                libevent-dev,
                libexpat1-dev,
-               libfreeradius-client-dev,
                libgeoip-dev (>= 1.4.5),
                libhiredis-dev (>= 0.10.0),
                libjansson-dev,
@@ -34,6 +33,7 @@ Build-Depends: bison,
                libpq-dev,
                libpurple-dev,
                librabbitmq-dev,
+               libradcli-dev,
                libreadline-dev,
                libsasl2-dev,
                libsctp-dev,
diff --git a/pkg/kamailio/deb/sid/kamailio.examples b/pkg/kamailio/deb/sid/kamailio.examples
index c48447a3e9c..e39721e20f0 100644
--- a/pkg/kamailio/deb/sid/kamailio.examples
+++ b/pkg/kamailio/deb/sid/kamailio.examples
@@ -1,2 +1 @@
 examples/*
-
diff --git a/pkg/kamailio/deb/sid/rules b/pkg/kamailio/deb/sid/rules
index 4cee767872d..5f4352d3611 100755
--- a/pkg/kamailio/deb/sid/rules
+++ b/pkg/kamailio/deb/sid/rules
@@ -19,9 +19,7 @@ include /usr/share/dpkg/buildflags.mk
 #export DH_VERBOSE=1
 
 export JAVA_HOME=/usr/lib/jvm/java-gcj
-
-# choose freeradius
-export FREERADIUS=1
+export RADCLI=1
 
 # modules not in the "main" kamailio package
 EXCLUDED_MODULES=
diff --git a/pkg/kamailio/deb/squeeze/control b/pkg/kamailio/deb/squeeze/control
index 38d84869b5d..a6c9530052a 100644
--- a/pkg/kamailio/deb/squeeze/control
+++ b/pkg/kamailio/deb/squeeze/control
@@ -15,7 +15,6 @@ Build-Depends: bison,
                libev-dev,
                libevent-dev,
                libexpat1-dev,
-               libradiusclient-ng-dev,
                libgeoip-dev (>= 1.4.5),
                libjson0-dev,
                libldap2-dev,
@@ -26,6 +25,7 @@ Build-Depends: bison,
                libpcre3-dev,
                libperl-dev,
                libpq-dev,
+               libradiusclient-ng-dev,
                libreadline-dev,
                libsasl2-dev,
                libsnmp-dev,
diff --git a/pkg/kamailio/deb/squeeze/kamailio.examples b/pkg/kamailio/deb/squeeze/kamailio.examples
index c48447a3e9c..e39721e20f0 100644
--- a/pkg/kamailio/deb/squeeze/kamailio.examples
+++ b/pkg/kamailio/deb/squeeze/kamailio.examples
@@ -1,2 +1 @@
 examples/*
-
diff --git a/pkg/kamailio/deb/squeeze/rules b/pkg/kamailio/deb/squeeze/rules
index bb5ec8e4d3e..e4136d643f3 100755
--- a/pkg/kamailio/deb/squeeze/rules
+++ b/pkg/kamailio/deb/squeeze/rules
@@ -18,8 +18,6 @@ DPKG_EXPORT_BUILDFLAGS = 1
 #export DH_VERBOSE=1
 
 
-# choose freeradius
-
 # modules not in the "main" kamailio package
 EXCLUDED_MODULES=
 
diff --git a/pkg/kamailio/deb/stretch/control b/pkg/kamailio/deb/stretch/control
index 84e5d4a4b4f..6df63a53a6e 100644
--- a/pkg/kamailio/deb/stretch/control
+++ b/pkg/kamailio/deb/stretch/control
@@ -18,7 +18,6 @@ Build-Depends: bison,
                libev-dev,
                libevent-dev,
                libexpat1-dev,
-               libfreeradius-client-dev,
                libgeoip-dev (>= 1.4.5),
                libhiredis-dev (>= 0.10.0),
                libjansson-dev,
@@ -34,6 +33,7 @@ Build-Depends: bison,
                libpq-dev,
                libpurple-dev,
                librabbitmq-dev,
+               libradcli-dev,
                libreadline-dev,
                libsasl2-dev,
                libsctp-dev,
diff --git a/pkg/kamailio/deb/stretch/kamailio.examples b/pkg/kamailio/deb/stretch/kamailio.examples
index c48447a3e9c..e39721e20f0 100644
--- a/pkg/kamailio/deb/stretch/kamailio.examples
+++ b/pkg/kamailio/deb/stretch/kamailio.examples
@@ -1,2 +1 @@
 examples/*
-
diff --git a/pkg/kamailio/deb/stretch/rules b/pkg/kamailio/deb/stretch/rules
index 4cee767872d..5f4352d3611 100755
--- a/pkg/kamailio/deb/stretch/rules
+++ b/pkg/kamailio/deb/stretch/rules
@@ -19,9 +19,7 @@ include /usr/share/dpkg/buildflags.mk
 #export DH_VERBOSE=1
 
 export JAVA_HOME=/usr/lib/jvm/java-gcj
-
-# choose freeradius
-export FREERADIUS=1
+export RADCLI=1
 
 # modules not in the "main" kamailio package
 EXCLUDED_MODULES=
diff --git a/pkg/kamailio/deb/trusty/control b/pkg/kamailio/deb/trusty/control
index 6a92105bddf..7a0d1ace652 100644
--- a/pkg/kamailio/deb/trusty/control
+++ b/pkg/kamailio/deb/trusty/control
@@ -17,7 +17,6 @@ Build-Depends: bison,
                libev-dev,
                libevent-dev,
                libexpat1-dev,
-               libfreeradius-client-dev,
                libgeoip-dev (>= 1.4.5),
                libhiredis-dev (>= 0.10.0),
                libjansson-dev,
@@ -33,6 +32,7 @@ Build-Depends: bison,
                libpq-dev,
                libpurple-dev,
                librabbitmq-dev,
+               libfreeradius-client-dev,
                libreadline-dev,
                libsasl2-dev,
                libsctp-dev,
diff --git a/pkg/kamailio/deb/trusty/kamailio.examples b/pkg/kamailio/deb/trusty/kamailio.examples
index c48447a3e9c..e39721e20f0 100644
--- a/pkg/kamailio/deb/trusty/kamailio.examples
+++ b/pkg/kamailio/deb/trusty/kamailio.examples
@@ -1,2 +1 @@
 examples/*
-
diff --git a/pkg/kamailio/deb/trusty/rules b/pkg/kamailio/deb/trusty/rules
index 6fc2ce691d0..a9e8cd443b2 100755
--- a/pkg/kamailio/deb/trusty/rules
+++ b/pkg/kamailio/deb/trusty/rules
@@ -19,8 +19,6 @@ include /usr/share/dpkg/buildflags.mk
 #export DH_VERBOSE=1
 
 export JAVA_HOME=/usr/lib/jvm/java-gcj
-
-# choose freeradius
 export FREERADIUS=1
 
 # modules not in the "main" kamailio package
diff --git a/pkg/kamailio/deb/wheezy/control b/pkg/kamailio/deb/wheezy/control
index e83528cd150..efa50915134 100644
--- a/pkg/kamailio/deb/wheezy/control
+++ b/pkg/kamailio/deb/wheezy/control
@@ -17,7 +17,6 @@ Build-Depends: bison,
                libev-dev,
                libevent-dev,
                libexpat1-dev,
-               libradiusclient-ng-dev,
                libgeoip-dev (>= 1.4.5),
                libhiredis-dev (>= 0.10.0),
                libjansson-dev,
@@ -31,6 +30,7 @@ Build-Depends: bison,
                libpcre3-dev,
                libperl-dev,
                libpq-dev,
+               libradiusclient-ng-dev,
                libreadline-dev,
                libsasl2-dev,
                libsctp-dev,
diff --git a/pkg/kamailio/deb/wheezy/kamailio.examples b/pkg/kamailio/deb/wheezy/kamailio.examples
index c48447a3e9c..e39721e20f0 100644
--- a/pkg/kamailio/deb/wheezy/kamailio.examples
+++ b/pkg/kamailio/deb/wheezy/kamailio.examples
@@ -1,2 +1 @@
 examples/*
-
diff --git a/pkg/kamailio/deb/wheezy/rules b/pkg/kamailio/deb/wheezy/rules
index 0f38bebe6aa..9668a2769cd 100755
--- a/pkg/kamailio/deb/wheezy/rules
+++ b/pkg/kamailio/deb/wheezy/rules
@@ -20,8 +20,6 @@ include /usr/share/dpkg/buildflags.mk
 
 export JAVA_HOME=/usr/lib/jvm/java-gcj
 
-# choose freeradius
-
 # modules not in the "main" kamailio package
 EXCLUDED_MODULES=