diff --git a/AUTHORS b/AUTHORS
index 81072cdb72..4d0606904b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -133,12 +133,15 @@ We have received the following contributions:
  - Sebasian Schrader
    2017-01: Fix build dir in doc/guide/Makefile.am
 
+ - Marvin Frick (MrMarvin)
+   2017-04: -h and --host parameters added to kea-admin
+
 Kea uses log4cplus (http://sourceforge.net/projects/log4cplus/) for logging,
 Boost (http://www.boost.org/) library for almost everything, and can use Botan
 (http://botan.randombit.net/) or OpenSSL (https://www.openssl.org/) for
 cryptographic operations. It can also optionally use PostgreSQL
 (http://www.postgresql.org/) and/or MySQL (http://www.mysql.com/) as a database.
 
-Kea can use googletest for unit-tests (http://code.google.com/p/googletest/).
+Kea can use googletest for unit-tests (https://github.com/google/googletest).
 
-Kea uses ISC Forge (http://kea.isc.org/wiki/IscForge) for conformance testing.
+Kea uses ISC Forge (https://github.com/isc-projects/forge/) for conformance testing.
diff --git a/ChangeLog b/ChangeLog
index 4189da76fc..7215b6b439 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,14 @@
+12XX.	[func]		MrMarvin
+	kea-admin now supports -h (and --host) parameter that can specify
+	MySQL or PostgreSQL database locations other than the default
+	localhost.
+	(Github #14, git tbd)
+
 1230.	[bug]		fdupont
 	kea-dhcp-ddns now correctly populates the original ID in the TSIG rdata
 	when doing signed updates.  Prior to this the value was set to zero
 	causing PowerDNS to reject then requests with a bad key error.
-	(Trac #5071, git cafa3d5c24f0112b0b9384a9c1083fe8a3eeb2bf) 
+	(Trac #5071, git cafa3d5c24f0112b0b9384a9c1083fe8a3eeb2bf)
 
 1229.	[func]		fdupont
 	A new command: config-test has been implemented in DHCPv4, DHCPv6
diff --git a/src/bin/admin/tests/pgsql_tests.sh.in b/src/bin/admin/tests/pgsql_tests.sh.in
index 3bd7072730..660550ce52 100644
--- a/src/bin/admin/tests/pgsql_tests.sh.in
+++ b/src/bin/admin/tests/pgsql_tests.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2015-2016 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2015-2017 Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -18,6 +18,7 @@ db_scripts_dir=@abs_top_srcdir@/src/share/database/scripts
 db_user="keatest"
 db_password="keatest"
 db_name="keatest"
+db_host="localhost"
 
 # Set location of the kea-admin.
 keaadmin=@abs_top_builddir@/src/bin/admin/kea-admin