diff --git a/net/kamailio-5.x/Makefile b/net/kamailio-5.x/Makefile
index 97e08ba..ecfad6d 100644
--- a/net/kamailio-5.x/Makefile
+++ b/net/kamailio-5.x/Makefile
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=kamailio5
-PKG_VERSION:=5.0.4
-PKG_RELEASE:=2
+PKG_VERSION:=5.1.1
+PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=https://www.kamailio.org/pub/kamailio/$(PKG_VERSION)/src
 PKG_SOURCE:=kamailio-$(PKG_VERSION)$(PKG_VARIANT)_src.tar.gz
-PKG_HASH:=71f1b560721f9c2bed9f7cbd3b4c08d8defd2daa8fd28ce55d3938781a654a13
+PKG_HASH:=96f15fd639d6ea2f4f9921e83ecddff0ac42732f2709bcf7269d591952676fc4
 PKG_USE_MIPS16:=0
 
 PKG_LICENSE:=GPL-2.0+
@@ -23,6 +23,7 @@ PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
 
 include $(INCLUDE_DIR)/nls.mk
 include $(INCLUDE_DIR)/package.mk
+include $(TOPDIR)/feeds/packages/lang/python/python-host.mk
 
 TARGET_CFLAGS += $(FPIC) -DVERSION_NODATE=1
 PREBUILT_STAMP=$(STAGING_DIR)/stamp/.$(PKG_NAME)_prebuilt
@@ -47,11 +48,11 @@ endef
 define Package/kamailio5/conffiles
 /etc/default/kamailio
 /etc/kamailio/kamailio.cfg
-/etc/kamailio/dictionary.kamailio
 /etc/kamailio/kamctlrc
 endef
 
 define Package/kamailio5/install
+$(foreach c,kamailio.cfg kamctlrc,$(call Package/kamailio5/install/conffile,$(1),$(c));)
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) \
 		$(PKG_INSTALL_DIR)/usr/sbin/kam{ailio,cmd,ctl,dbctl} \
@@ -60,27 +61,24 @@ define Package/kamailio5/install
 	$(CP) \
 		$(PKG_INSTALL_DIR)/usr/lib/kamailio/lib*.so* \
 		$(1)/usr/lib/kamailio/
-	$(INSTALL_DIR) $(1)/etc/kamailio
-	$(CP) \
-		$(PKG_BUILD_DIR)/etc/{dictionary.kamailio,kamailio.cfg,kamailio-basic.cfg} \
-		$(1)/etc/kamailio/
-	$(CP) \
-		$(PKG_BUILD_DIR)/utils/kamctl/kamctlrc \
-		$(1)/etc/kamailio/
 	$(INSTALL_DIR) $(1)/etc/default
-	$(CP) \
+	$(INSTALL_CONF) \
 		./files/kamailio.default \
 		$(1)/etc/default/kamailio
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) \
 		./files/kamailio.init \
 		$(1)/etc/init.d/kamailio
-	$(INSTALL_DIR) $(1)/usr/lib/kamailio
 	$(CP) \
 		$(PKG_INSTALL_DIR)/usr/lib/kamailio/kamctl \
 		$(1)/usr/lib/kamailio/
 endef
 
+define Package/kamailio5/install/conffile
+	$(INSTALL_DIR) $(1)/etc/kamailio
+	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/kamailio/$(2) $(1)/etc/kamailio
+endef
+
 define Package/kamailio5/install/dbfiles
 	$(INSTALL_DIR) $(1)/usr/share/kamailio/$(2)
 	$(CP) $(PKG_INSTALL_DIR)/usr/share/kamailio/$(2)/* $(1)/usr/share/kamailio/$(2)/
@@ -100,14 +98,19 @@ define BuildKamailio5Module
     INCL_MODULES+=$(1)
     endif
   endef
-
+  define Package/kamailio5-mod-$(subst _,-,$(1))/conffiles
+$(subst $(space),$(newline),$(foreach c,$(6),/etc/kamailio/$(c)))
+  endef
   define Package/kamailio5-mod-$(subst _,-,$(1))/install
 $(call Package/kamailio5/install/module,$$(1),$(1))
+$(foreach c,$(6),$(call Package/kamailio5/install/conffile,$$(1),$(c));)
 $(foreach d,$(5),$(call Package/kamailio5/install/dbfiles,$$(1),$(d));)
   endef
 $$(eval $$(call BuildPackage,kamailio5-mod-$(subst _,-,$(1))))
 endef
 
+TARGET_CPPFLAGS+=$(if $(CONFIG_PACKAGE_kamailio5-mod-app-python),-I$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION))
+
 PKG_MAKE_ARGS:= \
 	prefix=/ \
 	cfg_dir=/etc/kamailio/ \
@@ -118,18 +121,14 @@ PKG_MAKE_ARGS:= \
 	group_include="standard" \
 	include_modules="$$(INCL_MODULES)" \
 	cfg_target:=/etc/kamailio/ \
-	TLS_HOOKS=1 \
-	extra_defs="-DUSE_PTHREAD_MUTEX " \
 	CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
+	LD_EXTRA_OPTS="$(TARGET_LDFLAGS)" \
 	LOCALBASE="$(STAGING_DIR)/usr" \
 	SYSBASE="$(STAGING_DIR)/usr" \
-	PCREDEFS:="$(TARGET_CPPFLAGS)" \
-	PCRELIBS:="$(TARGET_LDFLAGS)" \
 	CROSS_COMPILE=$(TARGET_CROSS) \
 	CC="$(TARGET_CC)" \
 	ARCH="$(ARCH)"  \
 	DESTDIR=$(PKG_INSTALL_DIR) \
-	EXTRA_LIBS="-L$(STAGING_DIR)/usr/lib/" \
 	quiet=verbose
 
 define Build/Compile
@@ -147,27 +146,46 @@ $(eval $(call BuildPackage,kamailio5))
 # 3 - Module description
 # 4 - Dependencies
 # 5 - Kamailio DB files
+# 6 - Configuration files
 ################################
 
 $(eval $(call BuildKamailio5Module,acc,Accounting,,+kamailio5-mod-tm))
+$(eval $(call BuildKamailio5Module,acc_diameter,Accounting for DIAMETER backend,,+kamailio5-mod-acc))
 $(eval $(call BuildKamailio5Module,alias_db,Database-backend aliases,,+kamailio5-mod-db-sqlite))
+$(eval $(call BuildKamailio5Module,app_jsdt,Execute JavaScript scripts,,))
 $(eval $(call BuildKamailio5Module,app_lua,Execute embedded Lua scripts,,+liblua))
+$(eval $(call BuildKamailio5Module,app_python,Execute Python scripts,,+python-light))
+$(eval $(call BuildKamailio5Module,app_sqlang,Execute Squirrel language scripts,,+libstdcpp))
 $(eval $(call BuildKamailio5Module,async,Asynchronous SIP handling functions,,+kamailio5-mod-tm +kamailio5-mod-tmx))
 $(eval $(call BuildKamailio5Module,auth,Authentication Framework,,))
 $(eval $(call BuildKamailio5Module,auth_db,Database-backend authentication,,+kamailio5-mod-auth +kamailio5-mod-db-sqlite))
 $(eval $(call BuildKamailio5Module,auth_diameter,Diameter authentication,,+kamailio5-mod-sl))
+$(eval $(call BuildKamailio5Module,auth_ephemeral,Ephemeral credentials,,+libopenssl))
 $(eval $(call BuildKamailio5Module,auth_identity,Identity authentication,,+libopenssl +libcurl))
 $(eval $(call BuildKamailio5Module,auth_xkeys,Shared-key authentication,,+kamailio5-mod-auth))
 $(eval $(call BuildKamailio5Module,avp,Functions for handling AVPs,,))
 $(eval $(call BuildKamailio5Module,avpops,AVP operation,,))
 $(eval $(call BuildKamailio5Module,benchmark,Config benchmark,,))
 $(eval $(call BuildKamailio5Module,blst,Blacklisting API for config,,))
+$(eval $(call BuildKamailio5Module,call_control,Call Control,,+kamailio5-mod-dialog +kamailio5-mod-pv))
+$(eval $(call BuildKamailio5Module,call_obj,Call identification support,,))
+$(eval $(call BuildKamailio5Module,carrierroute,Carrier Route,,))
+$(eval $(call BuildKamailio5Module,cdp,C Diameter Peer,,))
+$(eval $(call BuildKamailio5Module,cdp_avp,CDP AVP helper module,,+kamailio5-mod-cdp))
 $(eval $(call BuildKamailio5Module,cfgutils,Config utilities,,))
 $(eval $(call BuildKamailio5Module,cfg_db,Load parameters from database,,+kamailio5-mod-db-sqlite))
 $(eval $(call BuildKamailio5Module,cfg_rpc,Update parameters via RPC,,))
+$(eval $(call BuildKamailio5Module,cfgt,Unit test reporting,,))
 $(eval $(call BuildKamailio5Module,cnxcc,Limit call duration,,+kamailio5-mod-dialog +libhiredis +libevent2))
 $(eval $(call BuildKamailio5Module,corex,Legacy functions,,))
+$(eval $(call BuildKamailio5Module,counters,Functions for counter manipulation,,))
+$(eval $(call BuildKamailio5Module,cplc,Call Processing Language interpreter,,+kamailio5-mod-sl +kamailio5-mod-tm +kamailio5-mod-usrloc))
+$(eval $(call BuildKamailio5Module,crypto,Various cryptography tools,,+libopenssl))
 $(eval $(call BuildKamailio5Module,ctl,BINRPC transport interface,,))
+$(eval $(call BuildKamailio5Module,db2_ldap,DBv2 LDAP module,,+libopenldap))
+$(eval $(call BuildKamailio5Module,db2_ops,Run SQL queries from script,,))
+$(eval $(call BuildKamailio5Module,db_berkeley,Berkeley DB backend,,+libdb47))
+$(eval $(call BuildKamailio5Module,db_cluster,Database clustering system,,))
 $(eval $(call BuildKamailio5Module,db_flatstore,fast write-only text DB-backend,,))
 $(eval $(call BuildKamailio5Module,db_mysql,MySQL DB-backend,,+libmysqlclient,mysql))
 $(eval $(call BuildKamailio5Module,db_postgres,PostgreSQL DB-backend,,@!arc +libpq,postgres))
@@ -176,45 +194,81 @@ $(eval $(call BuildKamailio5Module,db_text,Text DB-backend,,,dbtext/kamailio))
 $(eval $(call BuildKamailio5Module,db_unixodbc,UnixODBC DB-backend,,+unixodbc))
 $(eval $(call BuildKamailio5Module,debugger,Interactive config file debugger,,))
 $(eval $(call BuildKamailio5Module,dialog,Dialog support,,+kamailio5-mod-rr +kamailio5-mod-tm))
-$(eval $(call BuildKamailio5Module,dialplan,Dialplan management,,))
+$(eval $(call BuildKamailio5Module,dialplan,Dialplan management,,+libpcre))
 $(eval $(call BuildKamailio5Module,dispatcher,Dispatcher,,))
 $(eval $(call BuildKamailio5Module,diversion,Diversion header insertion,,))
+$(eval $(call BuildKamailio5Module,dmq,Distributed Message Queue,,+kamailio5-mod-sl +kamailio5-mod-tm))
+$(eval $(call BuildKamailio5Module,dmq_usrloc,DMQ USRLOC replication,,+kamailio5-mod-dmq +kamailio5-mod-usrloc))
 $(eval $(call BuildKamailio5Module,domain,Multi-domain support,,))
 $(eval $(call BuildKamailio5Module,domainpolicy,Domain policy,,))
 $(eval $(call BuildKamailio5Module,drouting,Dynamic routing module,,))
 $(eval $(call BuildKamailio5Module,enum,ENUM lookup,,))
+$(eval $(call BuildKamailio5Module,erlang,Erlang node connector module,,@!USE_MUSL +erlang))
 $(eval $(call BuildKamailio5Module,evapi,push event details via tcp,,+libev))
+$(eval $(call BuildKamailio5Module,evrexec,Execut event routes at startup,,))
 $(eval $(call BuildKamailio5Module,exec,External exec,,))
 $(eval $(call BuildKamailio5Module,group,Database-backend user-groups,,))
+$(eval $(call BuildKamailio5Module,gzcompress,Compress SIP messages,,+zlib))
 $(eval $(call BuildKamailio5Module,h350,H.350,,+kamailio5-mod-ldap +libopenldap))
 $(eval $(call BuildKamailio5Module,htable,Hash Table,,))
+$(eval $(call BuildKamailio5Module,http_client,HTTP client using CURL,,+libcurl))
 $(eval $(call BuildKamailio5Module,imc,IM conferencing,,+kamailio5-mod-db-mysql +kamailio5-mod-tm))
+$(eval $(call BuildKamailio5Module,ims_auth,IMS authentication module,,+kamailio5-mod-cdp +kamailio5-mod-cdp-avp +kamailio5-mod-tm))
+$(eval $(call BuildKamailio5Module,ims_charging,IMS charging component module,,+kamailio5-mod-cdp +kamailio5-mod-cdp-avp +kamailio5-mod-tm))
+$(eval $(call BuildKamailio5Module,ims_dialog,IMS dialog tracking module,,+kamailio5-mod-rr +kamailio5-mod-tm))
+$(eval $(call BuildKamailio5Module,ims_diameter_server,IMS DIAMETER server module,,+kamailio5-mod-cdp +kamailio5-mod-cdp-avp))
+$(eval $(call BuildKamailio5Module,ims_icscf,IMS ICSCF component module,,+kamailio5-mod-cdp +kamailio5-mod-cdp-avp +kamailio5-mod-sl +kamailio5-mod-tm))
+$(eval $(call BuildKamailio5Module,ims_isc,IMS ISC component module,,+kamailio5-mod-ims-usrloc-scscf +kamailio5-mod-tm))
+$(eval $(call BuildKamailio5Module,ims_ocs,MS OCS component module,,+kamailio5-mod-cdp +kamailio5-mod-cdp-avp))
+$(eval $(call BuildKamailio5Module,ims_qos,IMS Diameter Rx interface between PCSCF and PCRF functions,,+kamailio5-mod-cdp +kamailio5-mod-cdp-avp +kamailio5-mod-ims-dialog +kamailio5-mod-ims-usrloc-pcscf +kamailio5-mod-tm))
+$(eval $(call BuildKamailio5Module,ims_registrar_pcscf,MS PCSCF registrar module,,+kamailio5-mod-ims-usrloc-pcscf))
+$(eval $(call BuildKamailio5Module,ims_registrar_scscf,IMS SCSCF registrar module,,+kamailio5-mod-cdp +kamailio5-mod-cdp-avp +kamailio5-mod-ims-usrloc-scscf +kamailio5-mod-tm))
+$(eval $(call BuildKamailio5Module,ims_usrloc_pcscf,IMS PCSCF usrloc module,,))
+$(eval $(call BuildKamailio5Module,ims_usrloc_scscf,IMS SCSCF usrloc module,,))
 $(eval $(call BuildKamailio5Module,ipops,IP and IPv6 operations,,))
 $(eval $(call BuildKamailio5Module,jansson,Access to JSON attributes,,+jansson))
 $(eval $(call BuildKamailio5Module,janssonrpcc,Alternative JSONRPC server,,+kamailio5-mod-jansson +libevent2))
 $(eval $(call BuildKamailio5Module,json,Access to JSON document attributes,,+libjson-c))
 $(eval $(call BuildKamailio5Module,jsonrpcs,JSONRPC server over HTTP,,+kamailio5-mod-json +libevent2))
+$(eval $(call BuildKamailio5Module,keepalive,SIP keepalive monitoring,+kamailio5-mod-tm,))
 $(eval $(call BuildKamailio5Module,kex,Core extensions,,))
 $(eval $(call BuildKamailio5Module,lcr,Least Cost Routing,,+kamailio5-mod-tm +libpcre))
 $(eval $(call BuildKamailio5Module,ldap,LDAP connector,,+libopenldap))
+$(eval $(call BuildKamailio5Module,log_custom,Logging to custom backends,,))
+$(eval $(call BuildKamailio5Module,mangler,SDP mangling,,))
+$(eval $(call BuildKamailio5Module,matrix,Matrix operations,,))
 $(eval $(call BuildKamailio5Module,maxfwd,Max-Forward processor,,))
 $(eval $(call BuildKamailio5Module,mediaproxy,Automatic NAT traversal,,+kamailio5-mod-dialog))
+$(eval $(call BuildKamailio5Module,mohqueue,Music on hold queuing system,,+kamailio5-mod-rtpproxy +kamailio5-mod-sl +kamailio5-mod-tm))
+$(eval $(call BuildKamailio5Module,mqueue,Generic message queue system,,))
 $(eval $(call BuildKamailio5Module,msilo,SIP message silo,,+kamailio5-mod-tm))
 $(eval $(call BuildKamailio5Module,msrp,MSRP routing engine,,+kamailio5-mod-tls))
+$(eval $(call BuildKamailio5Module,mtree,Memory caching system,,))
 $(eval $(call BuildKamailio5Module,nathelper,NAT helper,,+kamailio5-mod-usrloc))
 $(eval $(call BuildKamailio5Module,nat_traversal,NAT traversal,,+kamailio5-mod-dialog +kamailio5-mod-sl +kamailio5-mod-tm))
+$(eval $(call BuildKamailio5Module,ndb_redis,Connect to REDIS NoSQL,,+libhiredis))
 $(eval $(call BuildKamailio5Module,nosip,non-sip package handling,,+kamailio5-mod-rr))
+$(eval $(call BuildKamailio5Module,outbound,SIP Outbound implementation,,+kamailio5-mod-stun +libopenssl))
+$(eval $(call BuildKamailio5Module,p_usrloc,Partitioned USRLOC services,,))
 $(eval $(call BuildKamailio5Module,path,SIP path insertion,,+kamailio5-mod-rr))
+$(eval $(call BuildKamailio5Module,pdb,Number portability module,,))
 $(eval $(call BuildKamailio5Module,pdt,Prefix-to-Domain translator,,))
 $(eval $(call BuildKamailio5Module,permissions,Permissions control,,))
 $(eval $(call BuildKamailio5Module,pike,Flood detector,,))
+$(eval $(call BuildKamailio5Module,pipelimit,Traffic shaping policies,,+kamailio5-mod-sl))
+$(eval $(call BuildKamailio5Module,prefix_route,Execute based on prefix,,))
 $(eval $(call BuildKamailio5Module,presence,Presence server,,+kamailio5-mod-sl +kamailio5-mod-tm +libxml2))
+$(eval $(call BuildKamailio5Module,presence_conference,Conference events,,+kamailio5-mod-presence))
 $(eval $(call BuildKamailio5Module,presence_dialoginfo,Dialog Event presence,,+kamailio5-mod-presence))
 $(eval $(call BuildKamailio5Module,presence_mwi,MWI presence,,+kamailio5-mod-presence))
+$(eval $(call BuildKamailio5Module,presence_profile,User profile extensions,,+kamailio5-mod-presence))
+$(eval $(call BuildKamailio5Module,presence_reginfo,Registration info,,+kamailio5-mod-presence))
 $(eval $(call BuildKamailio5Module,presence_xml,XCAP presence,,+kamailio5-mod-presence +kamailio5-mod-xcap-client))
 $(eval $(call BuildKamailio5Module,pua,Presence User Agent,,+kamailio5-mod-tm +libxml2))
 $(eval $(call BuildKamailio5Module,pua_bla,Bridged Line Appearence PUA,,+kamailio5-mod-presence +kamailio5-mod-pua +kamailio5-mod-usrloc))
 $(eval $(call BuildKamailio5Module,pua_dialoginfo,Dialog Event PUA,,+kamailio5-mod-dialog +kamailio5-mod-pua))
+$(eval $(call BuildKamailio5Module,pua_reginfo,PUA registration info,,+kamailio5-mod-pua +kamailio5-mod-usrloc))
+$(eval $(call BuildKamailio5Module,pua_rpc,RPC extensions for PUA,,+kamailio5-mod-pua))
 $(eval $(call BuildKamailio5Module,pua_usrloc,PUA User Location,,+kamailio5-mod-pua +kamailio5-mod-usrloc))
 $(eval $(call BuildKamailio5Module,pua_xmpp,PUA XMPP,,+kamailio5-mod-presence +kamailio5-mod-pua +kamailio5-mod-xmpp))
 $(eval $(call BuildKamailio5Module,pv,Pseudo-Variables,,))
@@ -225,34 +279,63 @@ $(eval $(call BuildKamailio5Module,registrar,SIP Registrar,,+kamailio5-mod-usrlo
 $(eval $(call BuildKamailio5Module,rls,Resource List Server,,+kamailio5-mod-presence +kamailio5-mod-pua +kamailio5-mod-tm +libxml2))
 $(eval $(call BuildKamailio5Module,rr,Record-Route and Route,,))
 $(eval $(call BuildKamailio5Module,rtimer,Routing Timer,,))
+$(eval $(call BuildKamailio5Module,rtjson,SIP routing based on JSON API,,))
 $(eval $(call BuildKamailio5Module,rtpengine,RTP engine,,+kamailio5-mod-tm))
 $(eval $(call BuildKamailio5Module,rtpproxy,RTP proxy,,+kamailio5-mod-tm))
 $(eval $(call BuildKamailio5Module,sanity,SIP sanity checks,,+kamailio5-mod-sl))
+$(eval $(call BuildKamailio5Module,sca,Shared Call Appearances,,+kamailio5-mod-sl +kamailio5-mod-tm))
 $(eval $(call BuildKamailio5Module,sctp,SCTP support,,+libsctp))
+$(eval $(call BuildKamailio5Module,sdpops,Managing SDP payloads,,))
+$(eval $(call BuildKamailio5Module,seas,Sip Express Application Server,,+kamailio5-mod-tm))
 $(eval $(call BuildKamailio5Module,sipcapture,SIP capture,,))
+$(eval $(call BuildKamailio5Module,sipdump,Save SIP traffic,,))
+$(eval $(call BuildKamailio5Module,sipt,SIP-T and SIP-I operations,,))
 $(eval $(call BuildKamailio5Module,siptrace,SIP trace,,))
 $(eval $(call BuildKamailio5Module,siputils,SIP utilities,,+kamailio5-mod-sl))
 $(eval $(call BuildKamailio5Module,sl,Stateless replier,,))
 $(eval $(call BuildKamailio5Module,sms,SIP-to-SMS IM gateway,,+kamailio5-mod-tm))
+$(eval $(call BuildKamailio5Module,smsops,Handle SMS packets in SIP,,))
+$(eval $(call BuildKamailio5Module,snmpstats,SNMP interface for statistics,,+libnetsnmp))
 $(eval $(call BuildKamailio5Module,speeddial,Per-user speed-dial controller,,))
 $(eval $(call BuildKamailio5Module,sqlops,SQL operations,,))
+$(eval $(call BuildKamailio5Module,ss7ops,JSON Operations for SS7 over HEP,,))
 $(eval $(call BuildKamailio5Module,statistics,Script statistics,,))
+$(eval $(call BuildKamailio5Module,statsc,Statistics collector,,))
+$(eval $(call BuildKamailio5Module,statsd,Connector for statsd application,,))
 $(eval $(call BuildKamailio5Module,stun,STUN server support,,))
 $(eval $(call BuildKamailio5Module,sst,SIP Session Timer,,+kamailio5-mod-dialog +kamailio5-mod-sl))
 $(eval $(call BuildKamailio5Module,tcpops,TCP options tweaking operations,,))
 $(eval $(call BuildKamailio5Module,textops,Text operations,,))
-$(eval $(call BuildKamailio5Module,tls,TLS operations,,+libopenssl))
+$(eval $(call BuildKamailio5Module,textopsx,Extra text operations,,))
+$(eval $(call BuildKamailio5Module,timer,Execute routing blocks on core timers,,))
+$(eval $(call BuildKamailio5Module,tls,TLS operations,,+libopenssl,,tls.cfg))
+$(eval $(call BuildKamailio5Module,tmrec,Match time recurrences,,))
 $(eval $(call BuildKamailio5Module,topoh,Topology hiding,,+kamailio5-mod-rr))
+$(eval $(call BuildKamailio5Module,topos,Topology stripping module,,+kamailio5-mod-rr))
+$(eval $(call BuildKamailio5Module,topos_redis,Redis backend for topos module,,+kamailio5-mod-ndb-redis +kamailio5-mod-topos))
 $(eval $(call BuildKamailio5Module,tm,Transaction,,))
 $(eval $(call BuildKamailio5Module,tmx,Transaction module extensions,,))
+$(eval $(call BuildKamailio5Module,tsilo,Transaction storage,,+kamailio5-mod-registrar +kamailio5-mod-sl +kamailio5-mod-tm))
 $(eval $(call BuildKamailio5Module,uac,User Agent Client,,+kamailio5-mod-tm))
 $(eval $(call BuildKamailio5Module,uac_redirect,User Agent Client redirection,,+kamailio5-mod-tm))
+$(eval $(call BuildKamailio5Module,uid_auth_db,Authentication module,,+kamailio5-mod-auth))
+$(eval $(call BuildKamailio5Module,uid_avp_db,AVP database operations,,))
+$(eval $(call BuildKamailio5Module,uid_domain,Domains management,,))
+$(eval $(call BuildKamailio5Module,uid_gflags,Global attributes and flags,,))
+$(eval $(call BuildKamailio5Module,uid_uri_db,Database URI operations,,))
 $(eval $(call BuildKamailio5Module,uri_db,Database-backend SIP URI checking,,))
 $(eval $(call BuildKamailio5Module,userblacklist,User blacklists,,))
 $(eval $(call BuildKamailio5Module,usrloc,User location,,))
 $(eval $(call BuildKamailio5Module,utils,Misc utilities,,+libcurl +libxml2))
 $(eval $(call BuildKamailio5Module,uuid,UUID utilities,,+libuuid))
+$(eval $(call BuildKamailio5Module,websocket,WebSocket transport layer,,+kamailio5-mod-sl +kamailio5-mod-tm +libopenssl +libunistring))
 $(eval $(call BuildKamailio5Module,xcap_client,XCAP Client,,+libcurl))
+$(eval $(call BuildKamailio5Module,xcap_server,XCAP server implementation,,+kamailio5-mod-xhttp +kamailio5-mod-sl))
+$(eval $(call BuildKamailio5Module,xhttp,Basic HTTP request handling server,,+kamailio5-mod-sl))
+$(eval $(call BuildKamailio5Module,xhttp_pi,HTTP provisioning interface,,+kamailio5-mod-xhttp))
+$(eval $(call BuildKamailio5Module,xhttp_rpc,RPC commands handling over HTTP,,+kamailio5-mod-xhttp))
 $(eval $(call BuildKamailio5Module,xlog,Advanced logger,,))
+$(eval $(call BuildKamailio5Module,xmlops,XML operations,,))
 $(eval $(call BuildKamailio5Module,xmlrpc,XML RPC module,,+libxml2))
 $(eval $(call BuildKamailio5Module,xmpp,SIP-to-XMPP Gateway,,+kamailio5-mod-tm +libexpat))
+$(eval $(call BuildKamailio5Module,xprint,Print messages with specifiers,,))
diff --git a/net/kamailio-5.x/patches/050-fix-kamailio-utils.patch b/net/kamailio-5.x/patches/050-fix-kamailio-utils.patch
index 9212073..afd1733 100644
--- a/net/kamailio-5.x/patches/050-fix-kamailio-utils.patch
+++ b/net/kamailio-5.x/patches/050-fix-kamailio-utils.patch
@@ -8,7 +8,7 @@
  #
 --- a/utils/kamctl/kamctlrc
 +++ b/utils/kamctl/kamctlrc
-@@ -151,3 +151,6 @@
+@@ -160,3 +160,6 @@
  ## Extra start options - default is: not set
  # example: start Kamailio with 64MB share memory: STARTOPTIONS="-m 64"
  # STARTOPTIONS=
@@ -23,8 +23,8 @@
  #
  # control tool for maintaining Kamailio databases
  #
---- kamailio5-5.0.2/utils/kamctl/kamdbctl.base	2017-06-26 13:57:13.000000000 +0200
-+++ kamailio5-x/utils/kamctl/kamdbctl.base	2017-08-13 20:17:54.033561438 +0200
+--- a/utils/kamctl/kamdbctl.base
++++ b/utils/kamctl/kamdbctl.base
 @@ -33,19 +33,19 @@ INSTALL_DBUID_TABLES=${INSTALL_DBUID_TAB
  
  # Used by dbtext and db_berkeley to define tables to be created, used by
diff --git a/net/kamailio-5.x/patches/120-libevent-libs.patch b/net/kamailio-5.x/patches/120-libevent-libs.patch
index cd50a3c..b3aa328 100644
--- a/net/kamailio-5.x/patches/120-libevent-libs.patch
+++ b/net/kamailio-5.x/patches/120-libevent-libs.patch
@@ -1,14 +1,3 @@
---- a/src/modules/cnxcc/Makefile
-+++ b/src/modules/cnxcc/Makefile
-@@ -45,7 +45,7 @@ else
- endif
- 
- DEFS+=$(HIREDISDEFS) $(LEVENTDEFS)
--LIBS=$(HIREDISLIBS) $(LEVENTLIBS)
-+LIBS=$(HIREDISLIBS) $(LEVENTLIBS) $(EXTRA_LIBS)
- 
- DEFS+=-DOPENSER_MOD_INTERFACE
- SERLIBPATH=../../lib
 --- a/src/modules/janssonrpcc/netstring.h
 +++ b/src/modules/janssonrpcc/netstring.h
 @@ -24,6 +24,7 @@