diff --git a/CHANGELOG b/CHANGELOG
index 8d0a70173..ef42ddbe0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,16 @@
 # This file chronicles user-level changes, beginning with the most recent.
 # =============================================================================
 
+Version 2.17.0 released 2019/06/10
+
+- Changed open source license to dual MIT/Apache-2.0
+
+- Removed FEI_mv/ml subdirectory and several FEI header files
+
+- Various bug fixes.
+
+#====================================
+
 Version 2.16.0 released 2019/03/20
 
 - Added new '--enable-mixedint' configure option. This introduces a HYPRE_BigInt
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index dd67c49aa..6764faeea 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -7,8 +7,8 @@ cmake_minimum_required (VERSION 2.8.8)
 project (hypre)
 
 # The version number.
-set (HYPRE_VERSION 2.16.0)
-set (HYPRE_DATE    2019/03/20)
+set (HYPRE_VERSION 2.17.0)
+set (HYPRE_DATE    2019/06/10)
 set (HYPRE_TIME    00:00:00)
 set (HYPRE_BUGS    hypre-support@llnl.gov)
 set (HYPRE_SRCDIR  "${PROJECT_SOURCE_DIR}")
diff --git a/src/config/configure.in b/src/config/configure.in
index d44504548..a02b44a27 100644
--- a/src/config/configure.in
+++ b/src/config/configure.in
@@ -1,9 +1,7 @@
-/******************************************************************************
- * Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
- * HYPRE Project Developers. See the top-level COPYRIGHT file for details.
- *
- * SPDX-License-Identifier: (Apache-2.0 OR MIT)
- ******************************************************************************/
+dnl Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+dnl HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+dnl
+dnl SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 dnl *********************************************************************
 dnl * File Name: configure.in
@@ -50,8 +48,8 @@ dnl * Set package information so it only has to be modified in one place
 dnl *********************************************************************
 
 m4_define([M4_HYPRE_NAME],    [hypre])
-m4_define([M4_HYPRE_VERSION], [2.16.0])
-m4_define([M4_HYPRE_DATE],    [2019/03/20])
+m4_define([M4_HYPRE_VERSION], [2.17.0])
+m4_define([M4_HYPRE_DATE],    [2019/06/10])
 m4_define([M4_HYPRE_TIME],    [00:00:00])
 m4_define([M4_HYPRE_BUGS],    [hypre-support@llnl.gov])
 m4_define([M4_HYPRE_SRCDIR],  [`pwd`])
@@ -64,13 +62,8 @@ AC_PREREQ(2.59)
 AC_REVISION($Id$)
 AC_INIT(M4_HYPRE_NAME, M4_HYPRE_VERSION)
 AC_CONFIG_HEADERS([HYPRE_config.h:config/HYPRE_config.h.in])
-AC_COPYRIGHT([Copyright (c) 2008,  Lawrence Livermore National Security, LLC.
-Produced at the Lawrence Livermore National Laboratory.
-This file is part of HYPRE.  See file COPYRIGHT for details.
-
-HYPRE is free software; you can redistribute it and/or modify it under the
-terms of the GNU Lesser General Public License (as published by the Free
-Software Foundation) version 2.1 dated February 1999.])
+AC_COPYRIGHT([Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+HYPRE Project Developers. See the top-level COPYRIGHT file for details.])
 
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_SRCDIR([HYPRE.h])
diff --git a/src/configure b/src/configure
index 9da702a83..0d6023eae 100755
--- a/src/configure
+++ b/src/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.in Id.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for hypre 2.16.0.
+# Generated by GNU Autoconf 2.69 for hypre 2.17.0.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -10,13 +10,8 @@
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 #
-# Copyright (c) 2008,  Lawrence Livermore National Security, LLC.
-# Produced at the Lawrence Livermore National Laboratory.
-# This file is part of HYPRE.  See file COPYRIGHT for details.
-#
-# HYPRE is free software; you can redistribute it and/or modify it under the
-# terms of the GNU Lesser General Public License (as published by the Free
-# Software Foundation) version 2.1 dated February 1999.
+# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 ## -------------------- ##
 ## M4sh Initialization. ##
 ## -------------------- ##
@@ -586,8 +581,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='hypre'
 PACKAGE_TARNAME='hypre'
-PACKAGE_VERSION='2.16.0'
-PACKAGE_STRING='hypre 2.16.0'
+PACKAGE_VERSION='2.17.0'
+PACKAGE_STRING='hypre 2.17.0'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1384,7 +1379,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures hypre 2.16.0 to adapt to many kinds of systems.
+\`configure' configures hypre 2.17.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1449,7 +1444,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of hypre 2.16.0:";;
+     short | recursive ) echo "Configuration of hypre 2.17.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1717,20 +1712,15 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-hypre configure 2.16.0
+hypre configure 2.17.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 
-Copyright (c) 2008,  Lawrence Livermore National Security, LLC.
-Produced at the Lawrence Livermore National Laboratory.
-This file is part of HYPRE.  See file COPYRIGHT for details.
-
-HYPRE is free software; you can redistribute it and/or modify it under the
-terms of the GNU Lesser General Public License (as published by the Free
-Software Foundation) version 2.1 dated February 1999.
+Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 _ACEOF
   exit
 fi
@@ -2174,7 +2164,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by hypre $as_me 2.16.0, which was
+It was created by hypre $as_me 2.17.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2560,8 +2550,8 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 HYPRE_NAME="hypre"
-HYPRE_VERSION="2.16.0"
-HYPRE_DATE="2019/03/20"
+HYPRE_VERSION="2.17.0"
+HYPRE_DATE="2019/06/10"
 HYPRE_TIME="00:00:00"
 HYPRE_BUGS="hypre-support@llnl.gov"
 HYPRE_SRCDIR="`pwd`"
@@ -9188,7 +9178,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by hypre $as_me 2.16.0, which was
+This file was extended by hypre $as_me 2.17.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -9250,7 +9240,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-hypre config.status 2.16.0
+hypre config.status 2.17.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/src/docs/copyright.txt b/src/docs/copyright.txt
index d1588c8bf..e6c6d6b86 100644
--- a/src/docs/copyright.txt
+++ b/src/docs/copyright.txt
@@ -1,7 +1,4 @@
-Copyright (c) 2008,  Lawrence Livermore National Security, LLC.
-Produced at the Lawrence Livermore National Laboratory.
-See file COPYRIGHT for details.
+Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
+HYPRE Project Developers. See the top-level COPYRIGHT file for details.
 
-HYPRE is free software; you can redistribute it and/or modify it under the
-terms of the GNU Lesser General Public License (as published by the Free
-Software Foundation) version 2.1 dated February 1999.
+SPDX-License-Identifier: (Apache-2.0 OR MIT)
diff --git a/src/docs/ref-manual/conf.doxygen b/src/docs/ref-manual/conf.doxygen
index 43ab90299..38b016528 100644
--- a/src/docs/ref-manual/conf.doxygen
+++ b/src/docs/ref-manual/conf.doxygen
@@ -31,7 +31,7 @@ PROJECT_NAME           = hypre
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER = 2.16.0
+PROJECT_NUMBER = 2.17.0
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 
diff --git a/src/docs/usr-manual/conf.py b/src/docs/usr-manual/conf.py
index b4b9469d2..64d344931 100644
--- a/src/docs/usr-manual/conf.py
+++ b/src/docs/usr-manual/conf.py
@@ -48,16 +48,16 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'hypre'
-copyright = u'2017, Lawrence Livermore National Laboratory'
+copyright = u'1998-2019 Lawrence Livermore National Security, LLC and other HYPRE Project Developers. See the top-level COPYRIGHT file for details.'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '2.16.0'
+version = '2.17.0'
 # The full version, including alpha/beta/rc tags.
-release = '2.16.0'
+release = '2.17.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -65,7 +65,7 @@ release = '2.16.0'
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
-today = 'March 20, 2019'
+today = 'June 10, 2019'
 # Else, today_fmt is used as the format for a strftime call.
 #today_fmt = '%B %d, %Y'