--- old/common/autoconf/libraries.m4	2016-01-20 11:43:41.921321410 +0100
+++ new/common/autoconf/libraries.m4	2016-01-20 11:43:41.749321401 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2015, 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
@@ -169,6 +169,16 @@
   LIBDL="$LIBS"
   AC_SUBST(LIBDL)
   LIBS="$save_LIBS"
+  
+  # The iconv library
+  ICONV_LIBS=-liconv
+  if test "x$OPENJDK_TARGET_OS_ENV" = "xbsd.openbsd"; then
+    ICONV_CFLAGS="-I/usr/local/include"
+  else
+    ICONV_CFLAGS=
+  fi
+  AC_SUBST(ICONV_LIBS)
+  AC_SUBST(ICONV_CFLAGS)
 
   # Deprecated libraries, keep the flags for backwards compatibility
   if test "x$OPENJDK_TARGET_OS" = "xwindows"; then