--- a/ChangeLog	Wed Apr 24 06:06:49 2019 +0100
+++ b/ChangeLog	Thu Apr 25 05:42:42 2019 +0100
@@ -1,3 +1,22 @@
+2019-04-22  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	PR3734: Make use of branding options
+	* INSTALL: Updated with new options.
+	* Makefile.am:
+	(ICEDTEA_CONFIGURE): Set --with-vendor-name,
+	--with-vendor-url, --with-vendor-bug-url and
+	--with-vendor-vm-bug-url in OpenJDK build using
+	our values.
+	* NEWS: Updated.
+	* acinclude.m4:
+	(IT_ARG_WITH): Convienence macro for --with-x
+	options.
+	(IT_VENDOR_OPTS): Provide --with-vendor-name,
+	--with-vendor-url, --with-vendor-bug-url and
+	--with-vendor-vm-bug-url.
+	* configure.ac:
+	Invoke IT_VENDOR_OPTS.
+
 2019-04-22  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	S8213419, PR3724: [AArch64] C2 may hang in

--- a/INSTALL	Wed Apr 24 06:06:49 2019 +0100
+++ b/INSTALL	Thu Apr 25 05:42:42 2019 +0100
@@ -211,6 +211,10 @@
 * --with-cacerts-file: Specify the location of a cacerts file, defaulting to
   ${SYSTEM_JDK_DIR}/jre/lib/security/cacerts
 * --disable-precompiled-headers: Don't use pre-compiled headers.
+* --with-vendor-name: Set the value used by the java.vendor & java.vm.vendor properties.
+* --with-vendor-url: Set the value used by the java.vendor.url property.
+* --with-vendor-bug-url: Set the value used by the java.vendor.url.bug property.
+* --with-vendor-vm-bug-url: Set the URL included in virtual machine crash dumps.
 
 Other options may be supplied which enable or disable new features.
 These are documented fully in the relevant section below.

--- a/Makefile.am	Wed Apr 24 06:06:49 2019 +0100
+++ b/Makefile.am	Thu Apr 25 05:42:42 2019 +0100
@@ -474,6 +474,10 @@
 	  --with-update-version=@JDK_UPDATE_VERSION@ \
 	  --with-build-number=@BUILD_VERSION@ \
 	  --with-milestone="fcs" \
+	  --with-vendor-name="${VENDOR_NAME}" \
+	  --with-vendor-url="${VENDOR_URL}" \
+	  --with-vendor-bug-url="${VENDOR_BUG_URL}" \
+	  --with-vendor-vm-bug-url="${VENDOR_VM_BUG_URL}" \
 	  --with-extra-cflags="$(CFLAGS)" \
 	  --with-extra-cxxflags="$(CXXFLAGS)" \
 	  --with-extra-ldflags="$(LDFLAGS)"

--- a/NEWS	Wed Apr 24 06:06:49 2019 +0100
+++ b/NEWS	Thu Apr 25 05:42:42 2019 +0100
@@ -16,6 +16,8 @@
   - S8211936, CVE-2019-2602: Better String parsing
   - S8218453, CVE-2019-2684: More dynamic RMI interactions
   - S8219066, CVE-2019-2698: Fuzzing TrueType fonts: setCurrGlyphID()
+* New features
+  - PR3734: Make use of branding options
 * Import of OpenJDK 8 u202 build 08
   - S8064811: Use THREAD instead of CHECK_NULL in return statements
   - S8068440: Test6857159.java times out

--- a/acinclude.m4	Wed Apr 24 06:06:49 2019 +0100
+++ b/acinclude.m4	Thu Apr 25 05:42:42 2019 +0100
@@ -2762,3 +2762,74 @@
   AC_SUBST([TAPSET_DIR])
   AM_CONDITIONAL(WITH_TAPSET_DIR, test "x${TAPSET_DIR_SET}" = "xyes")
 ])
+
+AC_DEFUN([IT_ARG_WITH],
+  [AC_ARG_WITH(m4_translit([[$1]], [_], [-]),
+   [AS_HELP_STRING([--with-m4_translit([$1], [_], [-])], [$2 [default=$3]])],
+   [$4="${withval}"], [$4=$5])
+  ]
+)
+
+AC_DEFUN_ONCE([IT_VENDOR_OPTS],
+[
+  VENDOR_NAME_DEFAULT="IcedTea"
+  AC_MSG_CHECKING([what vendor name to use])
+  IT_ARG_WITH([vendor_name],
+    [Set vendor name. Among others, used to set the 'java.vendor'
+     and 'java.vm.vendor' system properties.], IcedTea, VENDOR_NAME,
+     ${VENDOR_NAME_DEFAULT})
+  AC_MSG_RESULT([${VENDOR_NAME}])
+  if test "x${VENDOR_NAME}" = x ||
+     test "x${VENDOR_NAME}" = xyes ||
+     test "x${VENDOR_NAME}" = xno; then
+       AC_MSG_ERROR([--with-vendor-name must have a value])
+  elif [ ! [[ ${VENDOR_NAME} =~ ^[[:print:]]*$ ]] ]; then
+    AC_MSG_ERROR([--with-vendor-name value contains non-printing characters: ${VENDOR_NAME}])
+  fi
+  AC_SUBST(VENDOR_NAME)
+
+  VENDOR_URL_DEFAULT="http://icedtea.classpath.org"
+  AC_MSG_CHECKING([what vendor URL to use])
+  IT_ARG_WITH([vendor_url],
+    [Set the 'java.vendor.url' system property],
+    http://icedtea.classpath.org, VENDOR_URL, ${VENDOR_URL_DEFAULT})
+  AC_MSG_RESULT([${VENDOR_URL}])
+  if test "x${VENDOR_URL}" = x ||
+     test "x${VENDOR_URL}" = xyes ||
+     test "x${VENDOR_URL}" = xno; then
+       AC_MSG_ERROR([--with-vendor-url must have a value])
+  elif [ ! [[ ${VENDOR_URL} =~ ^[[:print:]]*$ ]] ]; then
+    AC_MSG_ERROR([--with-vendor-url value contains non-printing characters: ${VENDOR_URL}])
+  fi
+  AC_SUBST(VENDOR_URL)
+
+  VENDOR_BUG_URL_DEFAULT="http://icedtea.classpath.org/bugzilla"
+  AC_MSG_CHECKING([what vendor bug URL to use])
+  IT_ARG_WITH([vendor_bug_url],
+    [Set the 'java.vendor.url.bug' system property],
+    http://icedtea.classpath.org/bugzilla, VENDOR_BUG_URL, ${VENDOR_BUG_URL_DEFAULT})
+  AC_MSG_RESULT([${VENDOR_BUG_URL}])
+  if test "x${VENDOR_BUG_URL}" = x ||
+     test "x${VENDOR_BUG_URL}" = xyes ||
+     test "x${VENDOR_BUG_URL}" = xno; then
+       AC_MSG_ERROR([--with-vendor-bug-url must have a value])
+  elif [ ! [[ ${VENDOR_BUG_URL} =~ ^[[:print:]]*$ ]] ]; then
+    AC_MSG_ERROR([--with-vendor-bug-url value contains non-printing characters: ${VENDOR_BUG_URL}])
+  fi
+  AC_SUBST(VENDOR_BUG_URL)
+
+  VENDOR_VM_BUG_URL_DEFAULT=${VENDOR_BUG_URL}
+  AC_MSG_CHECKING([what vendor VM bug URL to use])
+  IT_ARG_WITH([vendor_vm_bug_url],
+    [Sets the bug URL which will be displayed when the VM crashes],
+    VENDOR_BUG_URL, VENDOR_VM_BUG_URL, ${VENDOR_VM_BUG_URL_DEFAULT})
+  AC_MSG_RESULT([${VENDOR_VM_BUG_URL}])
+  if test "x${VENDOR_VM_BUG_URL}" = x ||
+     test "x${VENDOR_VM_BUG_URL}" = xyes ||
+     test "x${VENDOR_VM_BUG_URL}" = xno; then
+       AC_MSG_ERROR([--with-vendor-vm-bug-url must have a value])
+  elif [ ! [[ ${VENDOR_VM_BUG_URL} =~ ^[[:print:]]*$ ]] ]; then
+    AC_MSG_ERROR([--with-vendor-vm-bug-url value contains non-printing characters: ${VENDOR_VM_BUG_URL}])
+  fi
+  AC_SUBST(VENDOR_VM_BUG_URL)
+])

--- a/configure.ac	Wed Apr 24 06:06:49 2019 +0100
+++ b/configure.ac	Thu Apr 25 05:42:42 2019 +0100
@@ -83,6 +83,7 @@
 AM_CONDITIONAL([ENABLE_DOCS], [test x$ENABLE_DOCS = xyes])
 AC_MSG_RESULT(${ENABLE_DOCS})
 
+IT_VENDOR_OPTS
 IT_GET_PKGVERSION
 IT_GET_LSB_DATA