Index: include/memory
===================================================================
--- include/memory
+++ include/memory
@@ -3702,11 +3702,25 @@
     _Tp* get() _NOEXCEPT {return _VSTD::addressof(__data_.second());}
 };
 
+template <typename _Tp>
+void
+__shared_ptr_emplace__destroy(_Tp& t)
+{
+    t.~_Tp();
+}
+
+template <typename _Tp, std::size_t __n>
+void
+__shared_ptr_emplace__destroy(_Tp (&t)[__n])
+{
+    for (auto i = __n; i > 0; i--) __shared_ptr_emplace__destroy(t[i]);
+}
+
 template <class _Tp, class _Alloc>
 void
 __shared_ptr_emplace<_Tp, _Alloc>::__on_zero_shared() _NOEXCEPT
 {
-    __data_.second().~_Tp();
+    __shared_ptr_emplace__destroy(__data_.second());
 }
 
 template <class _Tp, class _Alloc>
@@ -4699,11 +4713,7 @@
 
 template<class _Tp, class ..._Args>
 inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    !is_array<_Tp>::value,
-    shared_ptr<_Tp>
->::type
+shared_ptr<_Tp>
 make_shared(_Args&& ...__args)
 {
     return shared_ptr<_Tp>::make_shared(_VSTD::forward<_Args>(__args)...);
Index: test/libcxx/memory/shared_ptr_array.pass.cpp
===================================================================
--- test/libcxx/memory/shared_ptr_array.pass.cpp
+++ test/libcxx/memory/shared_ptr_array.pass.cpp
@@ -0,0 +1,83 @@
+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+
+// <memory>
+// UNSUPPORTED: c++98, c++03, c++11, c++14, c++17
+
+#include <memory>
+#include <string>
+
+#include "test_macros.h"
+#include "min_allocator.h"
+#include "test_allocator.h"
+
+static int constructor_count = 0;
+static int destructor_count = 0;
+
+struct test_onstructors
+{
+    test_onstructors()
+    {
+        constructor_count++;
+    }
+
+    ~test_onstructors()
+    {
+        destructor_count++;
+    }
+
+};
+
+template <typename T>
+void test_make_shared()
+{
+    std::shared_ptr<T[64]> foo = std::make_shared<T[64]>();
+    std::shared_ptr<T[64]> bar(foo);
+
+    typedef decltype(**foo) foo_element_type;
+    typedef decltype(**bar) bar_element_type;
+    
+    assert(typeid(foo_element_type) == typeid(T) && "Types do not match");
+    assert(typeid(bar_element_type) == typeid(T) && "Types do not match");
+    
+    /* XXX: Why doesnt this work?
+    int i[64];
+    auto pi = &i;
+    ASSERT_SAME_TYPE(decltype(**pi), int);
+     */
+}
+
+void test_values()
+{
+    std::shared_ptr<int[64]> foo = std::make_shared<int[64]>();
+    
+    for (int i = 0; i < 64; i++)
+        (*foo)[i] = i;
+    
+    for (int i = 0; i < 64; i++)
+        assert((*foo)[i] == i && "Incorrect retrieved from array value");
+}
+
+void test_constructor_count()
+{
+    std::shared_ptr<test_onstructors[64]> foo = std::make_shared<test_onstructors[64]>();
+    assert(constructor_count == 64);
+}
+
+int main()
+{
+    test_make_shared<char>();
+    test_make_shared<int>();
+    test_make_shared<std::string>();
+    
+    test_values();
+    test_constructor_count();
+    
+    assert(destructor_count == 64);
+}