diff --git a/ChangeLog b/ChangeLog
index ac2e4d3c..118df96f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,8 @@ brevity. Much more detail can be found in the git revision history:
deadlocks during thread exit. (@jasone)
- Fix over-sized allocation of radix tree leaf nodes. (@mjp41, @ogaun,
@jasone)
+ - Fix over-sized allocation of arena_t (plus associated stats) data
+ structures. (@jasone, @interwq)
- Fix EXTRA_CFLAGS to not affect configuration. (@jasone)
- Fix a Valgrind integration bug. (@ronawho)
- Disallow 0x5a junk filling when running in Valgrind. (@jasone)
diff --git a/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj b/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj
index 9315022d..8342ab3a 100644
--- a/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj
+++ b/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj
@@ -69,12 +69,14 @@
+
+
-
+
@@ -110,11 +112,13 @@
+
+
{8D6BB292-9E1C-413D-9F98-4864BDC1514A}
diff --git a/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj.filters b/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj.filters
index 88c15efa..37f0f02a 100644
--- a/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj.filters
+++ b/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj.filters
@@ -146,6 +146,12 @@
Header Files\internal
+
+ Header Files\internal
+
+
+ Header Files\internal
+
Header Files\internal
@@ -161,7 +167,7 @@
Header Files\internal
-
+
Header Files\internal
@@ -241,6 +247,9 @@
Source Files
+
+ Source Files
+
Source Files
@@ -256,5 +265,8 @@
Source Files
+
+ Source Files
+
-
\ No newline at end of file
+
diff --git a/src/arena.c b/src/arena.c
index 43c3ccf2..d737ec9a 100644
--- a/src/arena.c
+++ b/src/arena.c
@@ -3461,8 +3461,8 @@ arena_new(tsdn_t *tsdn, unsigned ind)
if (config_stats) {
arena = (arena_t *)base_alloc(tsdn,
CACHELINE_CEILING(sizeof(arena_t)) +
- QUANTUM_CEILING((nlclasses * sizeof(malloc_large_stats_t)) +
- (nhclasses * sizeof(malloc_huge_stats_t))));
+ QUANTUM_CEILING((nlclasses * sizeof(malloc_large_stats_t)))
+ + (nhclasses * sizeof(malloc_huge_stats_t)));
} else
arena = (arena_t *)base_alloc(tsdn, sizeof(arena_t));
if (arena == NULL)