diff --git a/ChangeLog b/ChangeLog
index e32204d..90332d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
 chanes since 1.8.1
+	New features:
+	- Accept multiple source* configs for IPv4/v6
+	- Specify source per server
+
 	Bug fixes:
 	- Fix wrong config-unhexing if %25 (%) occurs
 
diff --git a/radsecproxy.c b/radsecproxy.c
index ffc5ded..a4b1211 100644
--- a/radsecproxy.c
+++ b/radsecproxy.c
@@ -2166,6 +2166,7 @@ void freeclsrvconf(struct clsrvconf *conf) {
     if (conf->hostsrc)
 	freegconfmstr(conf->hostsrc);
     free(conf->portsrc);
+    freegconfmstr(conf->source);
     free(conf->confsecret);
     free(conf->secret);
     free(conf->tls);
@@ -2260,6 +2261,7 @@ int mergesrvconf(struct clsrvconf *dst, struct clsrvconf *src) {
     if (!mergeconfstring(&dst->name, &src->name) ||
 	!mergeconfmstring(&dst->hostsrc, &src->hostsrc) ||
 	!mergeconfstring(&dst->portsrc, &src->portsrc) ||
+    !mergeconfmstring(&dst->source, &src->source) ||
 	!mergeconfstring(&dst->confsecret, &src->confsecret) ||
 	!mergeconfstring(&dst->tls, &src->tls) ||
 	!mergeconfstring(&dst->matchcertattr, &src->matchcertattr) ||
diff --git a/radsecproxy.conf.5.in b/radsecproxy.conf.5.in
index fc0f466..bf1814d 100644
--- a/radsecproxy.conf.5.in
+++ b/radsecproxy.conf.5.in
@@ -531,6 +531,12 @@ Specify the \fIport\fR (UDP/TCP) to connect to. If omitted, UDP and TCP will
 default to 1812 while TLS and DTLS will default to 2083.
 .RE
 
+.BI "Source (" address | \fR* )[\fR: port ]
+.RS
+Specify the source address and/or port to use for this server. See \fBSource...\fR 
+options above.
+.RE
+
 .BI "DynamicLookupCommand " command
 .RS
 Execude the \fIcommand\fR to dynamically configure a server. The executable file