--- old/common/autoconf/platform.m4	2016-01-20 11:43:42.773321456 +0100
+++ new/common/autoconf/platform.m4	2016-01-20 11:43:42.613321447 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -123,6 +123,14 @@
     *bsd*)
       VAR_OS=bsd
       VAR_OS_TYPE=unix
+      case "$1" in
+        *freebsd*)
+          VAR_OS_ENV=bsd.freebsd ;;
+        *openbsd*)
+          VAR_OS_ENV=bsd.openbsd ;;
+        *netbsd*)
+          VAR_OS_ENV=bsd.netbsd ;;
+      esac
       ;;
     *cygwin*)
       VAR_OS=windows
@@ -218,6 +226,11 @@
 
   AC_MSG_CHECKING([openjdk-target os-cpu])
   AC_MSG_RESULT([$OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU])
+
+  if test "x$OPENJDK_TARGET_OS_ENV" != "x$OPENJDK_TARGET_OS"; then
+    AC_MSG_CHECKING([openjdk-target os-env])
+    AC_MSG_RESULT([$OPENJDK_TARGET_OS_ENV])
+  fi
 ])
 
 # Check if a reduced build (32-bit on 64-bit platforms) is requested, and modify behaviour