diff --git a/CHANGELOG b/CHANGELOG
index b33d82b..7fcab2e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,10 @@
+1.2.5 (June 27, 2006) The "release for no good reason" release.
+   Changed some harmless code to make some compilers' warnings go away.
+   Added some more digits to pi -- why not.
+   Added kiss_fft_next_fast_size() function to help people decide how much to pad.
+   Changed multidimensional test from 8 dimensions to only 3 to avoid testing 
+   problems with fixed point (sorry Buckaroo Banzai).
+
 1.2.4 (Oct 27, 2005)   The "oops, inverse fixed point real fft was borked" release. 
    Fixed scaling bug for inverse fixed point real fft -- also fixed test code that should've been failing.
 	Thanks to Jean-Marc Valin for bug report.
diff --git a/Makefile b/Makefile
index 82f2dd3..19c716e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-KFVER=1_2_4
+KFVER=1_2_5
 
 DISTDIR=kiss_fft_v$(KFVER)
 TARBALL=kiss_fft_v$(KFVER).tar.gz
diff --git a/tools/kiss_fftnd.c b/tools/kiss_fftnd.c
index 9cdf6af..bf9e6b1 100644
--- a/tools/kiss_fftnd.c
+++ b/tools/kiss_fftnd.c
@@ -73,6 +73,19 @@ kiss_fftnd_cfg kiss_fftnd_alloc(const int *dims,int ndims,int inverse_fft,void*m
         st->states[i] = kiss_fft_alloc (st->dims[i], inverse_fft, ptr,&len);
         ptr += len;
     }
+    /*
+Hi there!
+
+If you're looking at this particular code, it probably means you've got a brain-dead bounds checker 
+that thinks the above code overwrites the end of the array.
+
+It doesn't.
+
+-- Mark 
+
+P.S.
+The below code might give you some warm fuzzies and help convince you.
+       */
     if ( ptr - (char*)st != (int)memneeded ) {
         fprintf(stderr,
                 "################################################################################\n"