diff --git a/configure.ac b/configure.ac
index 9aece5a67..28acba649 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1512,6 +1512,7 @@ echo "   * RSA:                       $ENABLED_RSA"
 echo "   * DSA:                       $ENABLED_DSA"
 echo "   * DH:                        $ENABLED_DH"
 echo "   * ECC:                       $ENABLED_ECC"
+echo "   * FPECC:                     $ENABLED_FPECC"
 echo "   * ASN:                       $ENABLED_ASN"
 echo "   * CODING:                    $ENABLED_CODING"
 echo "   * MEMORY:                    $ENABLED_MEMORY"
diff --git a/ctaocrypt/src/ecc.c b/ctaocrypt/src/ecc.c
index e57312d66..b980298c5 100644
--- a/ctaocrypt/src/ecc.c
+++ b/ctaocrypt/src/ecc.c
@@ -3440,6 +3440,9 @@ void ecc_fp_free(void)
    if (LockMutex(&ecc_fp_lock) == 0) {
        ecc_fp_free_cache();
        UnLockMutex(&ecc_fp_lock);
+
+       FreeMutex(&ecc_fp_lock);
+       initMutex = 0;
    }
 }
 
diff --git a/src/ssl.c b/src/ssl.c
index ad7dad04b..b09ea073b 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -4482,6 +4482,10 @@ int CyaSSL_Cleanup(void)
     if (FreeMutex(&count_mutex) != 0)
         ret = BAD_MUTEX_E;
 
+#if defined(HAVE_ECC) && defined(FP_ECC)
+    ecc_fp_free();
+#endif
+
     return ret;
 }