diff --git a/net/kamailio/Makefile b/net/kamailio/Makefile
index 1c39148fa164..280f0ff38ffe 100644
--- a/net/kamailio/Makefile
+++ b/net/kamailio/Makefile
@@ -4,6 +4,7 @@
 
 PORTNAME=	kamailio
 PORTVERSION=	4.2.3
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.kamailio.org/pub/kamailio/${PORTVERSION}/src/
 DISTNAME=	${PORTNAME}-${PORTVERSION}_src
@@ -80,13 +81,19 @@ EXTRA_MODULES+=	tls
 EXTRA_GROUPS+=	presence
 .endif
 
+.if !empty (EXTRA_GROUPS)
+MAKE_ARGS+=	group_include="${DEFAULT_GROUP_INCLUDE} ${EXTRA_GROUPS}"
+.else
+MAKE_ARGS+=	group_include="${DEFAULT_GROUP_INCLUDE}"
+.endif
+
 .if !empty (EXTRA_MODULES)
-MAKE_ARGS+=	group_include="${DEFAULT_GROUP_INCLUDE} ${EXTRA_GROUPS}" include_modules="${EXTRA_MODULES}"
+MAKE_ARGS+=	include_modules="${EXTRA_MODULES}"
 .endif
 
 post-patch:
 .if ! ${PORT_OPTIONS:MDOCS}
-	@${REINPLACE_CMD} -e 's#install-doc install-man#install-man#'	\
+	${REINPLACE_CMD} -e 's#install-doc install-man#install-man#'	\
 		${WRKSRC}/Makefile
 .endif
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 900000
@@ -128,17 +135,16 @@ post-stage:
 	xlog sipt siptrace qos pdb xprint auth_radius \
 	sanity uid_gflags db_text sdpops sipcapture \
 	tsilo nosip rtpengine jsonrpc-s \
-        presence presence_conference presence_dialog presence_dialoginfo \
-        presence_mwi \
-        presence_profile presence_reginfo presence_xml pua_bla \
-        pua_dialoginfo pua_mi pua_reginfo pua_usrloc rls \
-        acc_radius misc_radius peering pua pua_xmpp xcap_client xcap_server
+	presence presence_conference presence_dialog presence_dialoginfo \
+	presence_mwi \
+	presence_profile presence_reginfo presence_xml pua_bla \
+	pua_dialoginfo pua_mi pua_reginfo pua_usrloc rls \
+	acc_radius misc_radius peering pua pua_xmpp xcap_client xcap_server
 	@if [ -e ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/modules/${i}.so ]; then \
 		${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/modules/${i}.so; \
 	fi
 .endfor
 
-
 # Strip libraries in lib/kamailio
 	@${ECHO_CMD} "Stripping libraries in ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/"
 
diff --git a/net/kamailio/distinfo b/net/kamailio/distinfo
index c35d152a623d..3c65661f64f3 100644
--- a/net/kamailio/distinfo
+++ b/net/kamailio/distinfo
@@ -1,2 +1,2 @@
 SHA256 (kamailio-4.2.3_src.tar.gz) = 7dbbca4a515778d3e903380adcc49f727ddc4853238cb905e14c811a5671ed80
-SIZE (kamailio-4.2.2_src.tar.gz) = 11160883
+SIZE (kamailio-4.2.3_src.tar.gz) = 11160883
diff --git a/net/kamailio/files/patch-ip_addr_h b/net/kamailio/files/patch-ip_addr_h
index 5fc44d9c8e7a..6d58de0d7338 100644
--- a/net/kamailio/files/patch-ip_addr_h
+++ b/net/kamailio/files/patch-ip_addr_h
@@ -5,7 +5,7 @@
  #endif
  
 +#ifndef INADDR_LOOPBACK
-+#define INADDR_LOOPBACK                (long) 0x7F000001
++#define INADDR_LOOPBACK         (u_int32_t)0x7f000001
 +#endif
 +
  struct ip_addr{