diff --git a/CHANGES b/CHANGES
index 66ebb81..12edf46 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+2014-06-27  Torbjorn Rognes  <torognes@ifi.uio.no>
+	* Version 2.0.12
+	* Fixed a bug in memory allocation that caused segfaults.
+	* Fixed a minor memory leak.
+
 2014-06-27  Torbjorn Rognes  <torognes@ifi.uio.no>
 	* Version 2.0.11
 	* Resolved a bug that resulted in SWIPE terminating with a fatal
diff --git a/Linux/mpiswipe b/Linux/mpiswipe
index 184230d..fed7166 100755
Binary files a/Linux/mpiswipe and b/Linux/mpiswipe differ
diff --git a/Linux/swipe b/Linux/swipe
index d812126..b80640a 100755
Binary files a/Linux/swipe and b/Linux/swipe differ
diff --git a/Mac/mpiswipe b/Mac/mpiswipe
index d7bbc6e..ad0ce6c 100755
Binary files a/Mac/mpiswipe and b/Mac/mpiswipe differ
diff --git a/Mac/swipe b/Mac/swipe
index d72e369..9b76b55 100755
Binary files a/Mac/swipe and b/Mac/swipe differ
diff --git a/matrices.cc b/matrices.cc
index 5f796d6..7f737bb 100644
--- a/matrices.cc
+++ b/matrices.cc
@@ -599,9 +599,9 @@ void score_matrix_init()
 void score_matrix_free()
 {
   free(score_matrix_7);
-  score_matrix_7t = NULL;
-  free(score_matrix_7t);
   score_matrix_7 = NULL;
+  free(score_matrix_7t);
+  score_matrix_7t = NULL;
   free(score_matrix_8);
   score_matrix_8 = NULL;
   free(score_matrix_16);
diff --git a/swipe.cc b/swipe.cc
index bb1bd72..3f75ce2 100644
--- a/swipe.cc
+++ b/swipe.cc
@@ -172,7 +172,7 @@ void fatal(const char * format, const char * message)
 void * xmalloc(size_t size)
 {
   const size_t alignment = 16;
-  void * t;
+  void * t = NULL;
   posix_memalign(& t, alignment, size);
   
   if (t==NULL)
@@ -560,7 +560,6 @@ void align_threads_init()
   }
 
   long totalchunks;
-  long maxchunksize;
 
   calc_chunks(bins,
 	      threads,
diff --git a/swipe.h b/swipe.h
index 295fef0..4048c5c 100644
--- a/swipe.h
+++ b/swipe.h
@@ -55,7 +55,7 @@
 #define LINE_MAX 2048
 #endif
 
-#define SWIPE_VERSION "2.0.11"
+#define SWIPE_VERSION "2.0.12"
 
 // Should be 32bits integer
 typedef unsigned int UINT32;