diff --git a/el/mediaproxy-ng.init b/el/mediaproxy-ng.init
deleted file mode 100644
index 4d39a6c50..000000000
--- a/el/mediaproxy-ng.init
+++ /dev/null
@@ -1,219 +0,0 @@
-#!/bin/bash
-#
-# mediaproxy-ng		Startup script for NGCP mediaproxy-ng
-#
-# chkconfig: 345 84 16
-# description: NGCP mediaproxy-ng
-#
-# processname: mediaproxy-ng
-# config: /etc/sysconfig/mediaproxy-ng
-# pidfile: /var/run/mediaproxy-ng.pid
-#
-### BEGIN INIT INFO
-# Provides: mediaproxy-ng
-# Required-Start: $local_fs $network
-# Short-Description: NGCP mediaproxy-ng
-# Description: NGCP mediaproxy-ng 
-### END INIT INFO
-
-# Source function library.
-. /etc/rc.d/init.d/functions
-
-if [ -f /etc/sysconfig/mediaproxy-ng ]
-then
-        . /etc/sysconfig/mediaproxy-ng
-else
-	echo "Error: /etc/sysconfig/mediproxy-ng not present"
-	exit -1
-fi
-
-mediaproxy_ng=/usr/sbin/mediaproxy-ng
-prog=mediaproxy-ng
-pidfile=${PIDFILE-/var/run/mediaproxy-ng.pid}
-lockfile=${LOCKFILE-/var/lock/subsys/mediaproxy-ng}
-cachefile=/var/lib/mediaproxy-ng/mediaproxy-ng.cfg
-RETVAL=0
-
-OPTS="--pidfile $pidfile"
-MODULE=0
-IP6=0
-
-build_opts() {
-	shopt -s nocasematch
-	RPMS=`rpm -qa | grep ngcp-mediaproxy-ng-kernel`
-	if [[ "$KERNEL" == "yes" && -n "$TABLE" && -n "$RPMS" ]]
-	then
-		MODULE=1
-		OPTS+=" --table=$TABLE"
-	else
-		MODULE=0
-		OPTS+=" --table=-1"
-	fi
-
-	if [[ "$FALLBACK" != "yes" ]]
-	then
-		OPTS+=" --no-fallback"
-	fi
-	shopt -u nocasematch
-
-	if [[ -n "$RTP_IP" ]]
-	then
-		OPTS+=" --ip=$RTP_IP"
-	fi
-
-	if [[ -n "$RTP_ADV_IP" ]]
-	then
-		OPTS+=" --advertised-ip=$RTP_ADV_IP"
-	fi
-
-	if [[ -n "$RTP_IP6" ]]
-	then
-		OPTS+=" --ip6=$RTP_IP6"
-		IP6=1
-	fi
-
-	if [[ -n "$RTP_ADV_IP6" ]]
-	then
-		OPTS+=" --advertised-ip6=$RTP_ADV_IP6"
-	fi
-
-	if [[ -n "$LISTEN_TCP" ]]
-	then
-		OPTS+=" --listen-tcp=$LISTEN_TCP"
-	fi
-
-	if [[ -n "$LISTEN_UDP" ]]
-	then
-		OPTS+=" --listen-udp=$LISTEN_UDP"
-	fi
-
-	if [[ -n "$LISTEN_NG" ]]
-	then
-		OPTS+=" --listen-ng=$LISTEN_NG"
-	fi
-
-	if [[ -n "$TOS" ]]
-	then
-		OPTS+=" --tos=$TOS"
-	fi
-
-	if [[ -n "$TIMEOUT" ]]
-	then
-		OPTS+=" --timeout=$TIMEOUT"
-	fi
-
-	if [[ -n "$SILENT_TIMEOUT" ]]
-	then
-		OPTS+=" --silent-timeout=$SILENT_TIMEOUT"
-	fi
-
-	if [[ -n "$PORT_MIN" ]]
-	then
-		OPTS+=" --port-min=$PORT_MIN"
-	fi
-
-	if [[ -n "$PORT_MAX" ]]
-	then
-		OPTS+=" --port-max=$PORT_MAX"
-	fi
-
-	if [[ -n "$REDIS" ]]
-	then
-		OPTS+=" --redis=$REDIS"
-	fi
-
-	if [[ -n "$REDIS_DB" ]]
-	then
-		OPTS+=" --redis-db=$REDIS_DB"
-	fi
-
-	if [[ -n "$B2B_URL" ]]
-	then
-		OPTS+=" --b2b-url=$B2B_URL"
-	fi
-
-	if [[ -n "$LOG_LEVEL" ]]
-	then
-		OPTS+=" --log-level=$LOG_LEVEL"
-	fi
-}
-
-start() {
-	build_opts
-	if [[ $MODULE == 1 ]]
-	then
-		echo "Loading module for in-kernel packet forwarding"
-		modprobe xt_MEDIAPROXY
-		iptables -N mediaproxy
-		iptables -t filter -A INPUT -j mediaproxy
-		iptables -I mediaproxy -p udp -j MEDIAPROXY --id $TABLE
-		if [[ IP6 == 1 ]]
-		then
-    			ip6tables -I mediaproxy -p udp -j MEDIAPROXY --id $TABLE
-  		fi
-
-		cat <<EOF > "$cachefile"
-CUR_TABLE=$TABLE
-CUR_IP6=$IP6
-EOF
-	fi
-        echo -n $"Starting $prog: "
-        daemon --pidfile=${pidfile} $mediaproxy_ng $OPTS
-        RETVAL=$?
-        echo
-        [ $RETVAL = 0 ] && touch ${lockfile}
-        return $RETVAL
-}
-
-stop() {
-	echo -n $"Stopping $prog: "
-	killproc -p ${pidfile} $mediaproxy_ng
-	RETVAL=$?
-	echo
-	if [ -f "$cachefile" ]
-	then
-		. "$cachefile"
-		echo "Unloading module for in-kernel packet forwarding"
-		echo "del $TABLE" > /proc/mediaproxy/control
-		iptables -D mediaproxy -p udp -j MEDIAPROXY --id $CUR_TABLE
-		if [[ CUR_IP6 == 1 ]]
-		then
-    			ip6tables -D mediaproxy -p udp -j MEDIAPROXY --id $CUR_TABLE
-  		fi
-		iptables -t filter -D INPUT -j mediaproxy
-		iptables -X mediaproxy
-#		rmmod xt_MEDIAPROXY
-		rm -f $cachefile	
-	fi
- 
-	[ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile}
-}
-
-# See how we were called.
-case "$1" in
-  start)
-	start
-	;;
-  stop)
-	stop
-	;;
-  status)
-        status -p ${pidfile} $mediaproxy_ng
-	RETVAL=$?
-	;;
-  restart)
-	stop
-	start
-	;;
-  condrestart|try-restart)
-	if status -p ${pidfile} $mediaproxy_ng >&/dev/null; then
-		stop
-		start
-	fi
-	;;
-  *)
-	echo $"Usage: $prog {start|stop|restart|condrestart|try-restart|status}"
-	RETVAL=2
-esac
-
-exit $RETVAL
diff --git a/el/mediaproxy-ng.spec b/el/mediaproxy-ng.spec
deleted file mode 100644
index 76b14d659..000000000
--- a/el/mediaproxy-ng.spec
+++ /dev/null
@@ -1,156 +0,0 @@
-Name:		ngcp-mediaproxy-ng
-Version:	2.3.6
-Release:	0%{?dist}
-Summary:	The Sipwise NGCP mediaproxy-ng
-
-Group:		System Environment/Daemons
-License:	GPLv3
-URL:		https://github.com/sipwise/mediaproxy-ng
-Source0:	https://github.com/sipwise/mediaproxy-ng/archive/%{version}/%{name}-%{version}.tar.gz
-Conflicts:	%{name}-kernel < %{version}
-BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-
-BuildRequires:	gcc make pkgconfig redhat-rpm-config
-BuildRequires:	glib2-devel libcurl-devel openssl-devel pcre-devel
-BuildRequires:	xmlrpc-c-devel zlib-devel
-Requires:	glibc libcurl openssl pcre xmlrpc-c
-
-
-%description
-The Sipwise NGCP mediaproxy-ng is a proxy for RTP traffic and other UDP based
-media traffic. It's meant to be used with the Kamailio SIP proxy and forms a
-drop-in replacement for any of the other available RTP and media proxies.
-
-
-%package kernel
-Summary:	NGCP mediaproxy-ng in-kernel packet forwarding
-Group:		System Environment/Daemons
-BuildRequires:	gcc make redhat-rpm-config iptables-devel
-Requires:	iptables iptables-ipv6 ngcp-mediaproxy-ng = %{version}
-Requires:	ngcp-mediaproxy-ng-dkms = %{version}
-
-%description kernel
-NGCP mediaproxy-ng in-kernel packet forwarding
-
-
-%package dkms
-Summary:	Kernel module for NGCP mediaproxy-ng in-kernel packet forwarding
-Group:		System Environment/Daemons
-BuildArch:	noarch
-BuildRequires:	redhat-rpm-config
-Requires:	gcc make
-Requires(post):	epel-release dkms
-Requires(preun): epel-release dkms
-
-%description dkms
-Kernel module for mediaproxy-ng in-kernel packet forwarding
-
-
-%prep
-%setup -q
-
-
-%build
-cd daemon
-MEDIAPROXY_VERSION="\"%{version}-%{release}\"" make
-cd ../iptables-extension
-MEDIAPROXY_VERSION="\"%{version}-%{release}\"" make
-cd ..
-
-
-%install
-# Install the userspace daemon
-install -D -p -m755 daemon/mediaproxy-ng %{buildroot}/%{_sbindir}/mediaproxy-ng
-
-## Install the init.d script and configuration file
-install -D -p -m755 el/mediaproxy-ng.init \
-	%{buildroot}/%{_sysconfdir}/rc.d/init.d/mediaproxy-ng
-install -D -p -m644 el/mediaproxy-ng.sysconfig \
-	%{buildroot}/%{_sysconfdir}/sysconfig/mediaproxy-ng
-mkdir -p %{buildroot}/%{_sharedstatedir}/mediaproxy-ng
-
-# Install the iptables plugin
-install -D -p -m755 iptables-extension/libxt_MEDIAPROXY.so \
-	%{buildroot}/%{_lib}/xtables/libxt_MEDIAPROXY.so
-
-## DKMS module source install
-install -D -p -m644 kernel-module/Makefile \
-	 %{buildroot}/%{_usrsrc}/%{name}-%{version}-%{release}/Makefile
-install -D -p -m644 kernel-module/xt_MEDIAPROXY.c \
-	 %{buildroot}/%{_usrsrc}/%{name}-%{version}-%{release}/xt_MEDIAPROXY.c
-install -D -p -m644 kernel-module/xt_MEDIAPROXY.h \
-	 %{buildroot}/%{_usrsrc}/%{name}-%{version}-%{release}/xt_MEDIAPROXY.h
-sed "s/__VERSION__/%{version}-%{release}/g" debian/dkms.conf.in > \
-	%{buildroot}/%{_usrsrc}/%{name}-%{version}-%{release}/dkms.conf
-
-
-%clean
-rm -rf %{buildroot}
-
-
-%pre
-/usr/sbin/groupadd -r mediaproxy-ng 2> /dev/null || :
-/usr/sbin/useradd -r -g mediaproxy-ng -s /sbin/nologin -c "mediaproxy-ng daemon" \
-	-d %{_sharedstatedir}/mediaproxy-ng mediaproxy-ng \
-	2> /dev/null || :
-
-
-%post
-if [ $1 -eq 1 ]; then
-        /sbin/chkconfig --add %{name} || :
-fi
-
-
-%post dkms
-# Add to DKMS registry, build, and install module
-dkms add -m %{name} -v %{version}-%{release} --rpm_safe_upgrade &&
-dkms build -m %{name} -v %{version}-%{release} --rpm_safe_upgrade &&
-dkms install -m %{name} -v %{version}-%{release} --rpm_safe_upgrade --force
-true
-
-
-%preun
-if [ $1 = 0 ] ; then
-        /sbin/service %{name} stop >/dev/null 2>&1
-        /sbin/chkconfig --del %{name}
-fi
-
-
-%preun dkms
-# Remove from DKMS registry
-dkms remove -m %{name} -v %{version}-%{release} --rpm_safe_upgrade --all
-true
-
-
-%files
-# Userspace daemon
-%{_sbindir}/mediaproxy-ng
-
-# init.d script and configuration file
-%{_sysconfdir}/rc.d/init.d/mediaproxy-ng
-%config(noreplace) %{_sysconfdir}/sysconfig/mediaproxy-ng
-%dir %{_sharedstatedir}/mediaproxy-ng
-
-# Documentation
-%doc LICENSE README.md el/README.el.md debian/changelog debian/copyright
-
-
-%files kernel
-/%{_lib}/xtables/libxt_MEDIAPROXY.so
-
-
-%files dkms
-%attr(0755,root,root) %{_usrsrc}/%{name}-%{version}-%{release}/
-
-
-%changelog
-* Mon Nov 11 2013 Peter Dunkley <peter.dunkley@crocodilertc.net>
-  - Updated version to 2.3.2
-  - Set license to GPLv3
-* Thu Aug 15 2013 Peter Dunkley <peter.dunkley@crocodilertc.net>
-  - init.d scripts and configuration file
-* Wed Aug 14 2013 Peter Dunkley <peter.dunkley@crocodilertc.net>
-  - First version of .spec file
-  - Builds and installs userspace daemon (but no init.d scripts etc yet)
-  - Builds and installs the iptables plugin
-  - DKMS package for the kernel module
diff --git a/el/mediaproxy-ng.sysconfig b/el/mediaproxy-ng.sysconfig
deleted file mode 100644
index e1a5a82b3..000000000
--- a/el/mediaproxy-ng.sysconfig
+++ /dev/null
@@ -1,39 +0,0 @@
-# For more information on configuring mediaproxy-ng see
-# http://github.com/sipwise/mediproxy-ng
-#
-# (m) means the item is mandatory, (o) means the item is optional
-#
-KERNEL=yes		# (m) "yes" enable in-kernel forwarding, "no" disables
-TABLE=0			# (o) iptables table for in-kernel forwarding rules
-			#     comment out when "KERNEL=no"
-FALLBACK=yes		# (m) "yes" enables fallback to userspace forwarding
-			#     only, "no" disables
-RTP_IP=127.0.0.1	# (m) Local IPv4 address for packet forwarding
-#RTP_ADV_IP=127.0.0.1	# (o) IPv4 address to "advertise" for packet forwarding
-#RTP_IP6=::1		# (o) Local IPv6 address for packet forwarding
-#RTP_ADV_IP6=::1	# (o) IPv6 address to "advertise" for packet forwarding
-#
-# At least one of LISTEN_(TCP|UDP|NG) is required
-#LISTEN_TCP=127.0.0.1:2222	# IP address and port combination for TCP
-				# control
-LISTEN_UDP=127.0.0.1:2222	# IP address and port combination for UDP
-				# control
-#LISTEN_NG=127.0.0.1:2223 	# IP address and port combination for NG (UDP)
-				# control
-#
-#TOS=184		# (o) TOS value to use in outgoing packets
-#TIMEOUT=60		# (o) Number of seconds after which a media stream is
-			#     considered dead if there is no traffic.
-			#     Default: 60
-#SILENT_TIMEOUT=3600	# (o) Number of seconds after which a muted or inactive
-			#     stream is considered dead. Default: 3600
-#PORT_MIN=30000		# (o) Lowest port in the local port range for media
-			#     traffic. Default: 30000
-#PORT_MAX=40000		# (o) Highest port in the local port range for media
-			#     traffic. Default: 40000 
-#
-#LOG_LEVEL=6		# Log level to use
-# The following items are for use with NGCP
-#REDIS=127.0.0.1:6379
-#REDIS_DB=0
-#B2B_URL=http://127.0.0.1:8080/xmlrpc
diff --git a/el/rtpengine.init b/el/rtpengine.init
index 4b6f3e756..2a7371608 100644
--- a/el/rtpengine.init
+++ b/el/rtpengine.init
@@ -58,23 +58,23 @@ build_opts() {
 
 	if [[ -n "$RTP_IP" ]]
 	then
-		OPTS+=" --ip=$RTP_IP"
+		OPTS+=" --interface=$RTP_IP"
 	fi
 
 	if [[ -n "$RTP_ADV_IP" ]]
 	then
-		OPTS+=" --advertised-ip=$RTP_ADV_IP"
+		OPTS+="\!$RTP_ADV_IP"
 	fi
 
 	if [[ -n "$RTP_IP6" ]]
 	then
-		OPTS+=" --ip6=$RTP_IP6"
+		OPTS+=" --interface=$RTP_IP6"
 		IP6=1
 	fi
 
 	if [[ -n "$RTP_ADV_IP6" ]]
 	then
-		OPTS+=" --advertised-ip6=$RTP_ADV_IP6"
+		OPTS+="\!$RTP_ADV_IP6"
 	fi
 
 	if [[ -n "$LISTEN_TCP" ]]