diff --git a/configure.ac b/configure.ac
index 503776da4..82b2729c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1244,7 +1244,7 @@ fi
 
 # STACK SIZE info for examples
 AC_ARG_ENABLE([stacksize],
-    [  --enable-stacksize      Enable stack size info on examples (default: disabled)],
+    [AS_HELP_STRING([--enable-stacksize],[Enable stack size info on examples (default: disabled)])],
     [ ENABLED_STACKSIZE=$enableval ],
     [ ENABLED_STACKSIZE=no ]
     )
@@ -1257,6 +1257,19 @@ then
 fi
 
 
+# MEMORY SIZE info
+AC_ARG_ENABLE([trackmemory],
+    [AS_HELP_STRING([--enable-trackmemory],[Enable memory use info on wolfCrypt and wolfSSL cleanup (default: disabled)])],
+    [ ENABLED_TRACKMEMORY=$enableval ],
+    [ ENABLED_TRACKMEMORY=no ]
+    )
+
+if test "$ENABLED_TRACKMEMORY" = "yes"
+then
+    AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_TRACK_MEMORY"
+fi
+
+
 # MEMORY
 AC_ARG_ENABLE([memory],
     [  --enable-memory         Enable memory callbacks (default: enabled)],
diff --git a/examples/server/server.c b/examples/server/server.c
index 4ef51341f..7eb1bb287 100644
--- a/examples/server/server.c
+++ b/examples/server/server.c
@@ -265,7 +265,6 @@ static void Usage(void)
     printf("-d          Disable client cert check\n");
     printf("-b          Bind to any interface instead of localhost only\n");
     printf("-s          Use pre Shared keys\n");
-    printf("-t          Track wolfSSL memory use\n");
     printf("-u          Use UDP DTLS,"
            " add -v 2 for DTLSv1, -v 3 for DTLSv1.2 (default)\n");
 #ifdef WOLFSSL_SCTP
diff --git a/wolfssl/wolfcrypt/mem_track.h b/wolfssl/wolfcrypt/mem_track.h
index ee916d8bc..8a17d12df 100644
--- a/wolfssl/wolfcrypt/mem_track.h
+++ b/wolfssl/wolfcrypt/mem_track.h
@@ -219,15 +219,15 @@
     STATIC INLINE void ShowMemoryTracker(void)
     {
     #ifdef DO_MEM_STATS
-        printf("total   Allocs = %9lu\n",
+        printf("total   Allocs   = %9lu\n",
                                        (unsigned long)ourMemStats.totalAllocs);
         printf("total   Deallocs = %9lu\n",
                                        (unsigned long)ourMemStats.totalDeallocs);
-        printf("total   Bytes  = %9lu\n",
+        printf("total   Bytes    = %9lu\n",
                                        (unsigned long)ourMemStats.totalBytes);
-        printf("peak    Bytes  = %9lu\n",
+        printf("peak    Bytes    = %9lu\n",
                                        (unsigned long)ourMemStats.peakBytes);
-        printf("current Bytes  = %9lu\n",
+        printf("current Bytes    = %9lu\n",
                                        (unsigned long)ourMemStats.currentBytes);
     #endif
     }