diff --git a/LICENSE b/LICENSE
index 3eb0a094e01e624993fb0181bac11a1bb17ef741..9f9a1b943ba28dbaf28a8927e8ddafa79139f881 100644
--- a/LICENSE
+++ b/LICENSE
@@ -47,6 +47,8 @@ Copyright (c) 2012      The University of Wisconsin-La Crosse. All rights
                         reserved.
 Copyright (c) 2013-2019 Intel, Inc. All rights reserved.
 Copyright (c) 2011-2014 NVIDIA Corporation.  All rights reserved.
+Copyright (c) 2019      Amazon.com, Inc. or its affiliates.  All Rights
+                        reserved.
 
 $COPYRIGHT$
 
diff --git a/Makefile.am b/Makefile.am
index a48fc73e6ee6eed1d80779dda5789168d0b0c6d7..13d1c300b3cbe7765eaf62f3d61847ebe2926dac 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,6 +12,8 @@
 # Copyright (c) 2006-2016 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2012-2013 Los Alamos National Security, Inc.  All rights reserved.
 # Copyright (c) 2013-2018 Intel, Inc.  All rights reserved.
+# Copyright (c) 2019      Amazon.com, Inc. or its affiliates.  All Rights
+#                         reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -25,6 +27,7 @@ ACLOCAL_AMFLAGS = -I ./config
 
 SUBDIRS = config contrib include src etc bindings
 
+AM_DISTCHECK_CONFIGURE_FLAGS = --disable-dlopen
 
 headers =
 sources =
diff --git a/contrib/make_dist_tarball b/contrib/make_dist_tarball
index 97b020d08708d28b214fe4937f27b90a87193475..ffd7dd05fdf50d04b204c4b671be09db8234dba4 100755
--- a/contrib/make_dist_tarball
+++ b/contrib/make_dist_tarball
@@ -12,6 +12,8 @@
 #                         All rights reserved.
 # Copyright (c) 2008-2018 Cisco Systems, Inc.  All rights reserved
 # Copyright (c) 2015-2019 Intel, Inc.  All rights reserved.
+# Copyright (c) 2019      Amazon.com, Inc. or its affiliates.  All Rights
+#                         reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -105,7 +107,7 @@ done
 if test "$LIBEVENT" != ""; then
     echo "*** Found \$LIBEVENT: $LIBEVENT"
     echo "*** Adding --with-libevent=$LIBEVENT to config_args"
-    config_args="--with-libevent=$LIBEVENT $config_args --disable-dlopen"
+    config_args="--with-libevent=$LIBEVENT $config_args"
 fi
 
 # if config_args isn't empty, then add that to the distcheck_flags
@@ -113,9 +115,9 @@ fi
 # distcheck").
 if test "$config_args" != ""; then
     echo "*** Adding to distcheck_flags: $config_args"
-    distcheck_flags="$distcheck_flags AM_DISTCHECK_CONFIGURE_FLAGS=\"--disable-dlopen $config_args\""
+    distcheck_flags="$distcheck_flags $config_args"
 else
-    distcheck_flags="$distcheck_flags AM_DISTCHECK_CONFIGURE_FLAGS=\"--disable-dlopen\""
+    distcheck_flags="$distcheck_flags"
 fi
 
 export DISTCHECK_CONFIGURE_FLAGS=$config_args