diff --git a/CHANGES b/CHANGES
index b49fa5239c..9bb4bf6a70 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
 
+2.2-410 | 2014-05-02 12:49:53 -0500
+
+  * Replace an unneeded OPENSSL_malloc call. (Jon Siwek)
+
 2.2-409 | 2014-05-02 12:09:06 -0500
 
   * Clean up and documentation for base SNMP script. (Jon Siwek)
diff --git a/VERSION b/VERSION
index 12e210c885..861e91890f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.2-409
+2.2-410
diff --git a/src/file_analysis/analyzer/x509/X509.cc b/src/file_analysis/analyzer/x509/X509.cc
index 3cd886657b..debe38deaa 100644
--- a/src/file_analysis/analyzer/x509/X509.cc
+++ b/src/file_analysis/analyzer/x509/X509.cc
@@ -180,9 +180,7 @@ StringVal* file_analysis::X509::GetExtensionFromBIO(BIO* bio)
 		return new StringVal("");
 		}
 
-	// TODO: see about using regular malloc here, there were unknown problems
-	// using anything other than OPENSSL_malloc that need investigation.
-	char* buffer = (char*) OPENSSL_malloc(length);
+	char* buffer = (char*) malloc(length);
 
 	if ( ! buffer )
 		{
@@ -196,7 +194,7 @@ StringVal* file_analysis::X509::GetExtensionFromBIO(BIO* bio)
 	BIO_read(bio, (void*) buffer, length);
 	StringVal* ext_val = new StringVal(length, buffer);
 
-	OPENSSL_free(buffer);
+	free(buffer);
 	BIO_free_all(bio);
 
 	return ext_val;