diff --git a/CHANGELOG b/CHANGELOG
index 1045d4d..5c553ae 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,15 @@
 
+Changes in Rubber Band v1.8.2
+
+ * Fix a number of small memory leaks
+ * Make stretcher more robust to being fed invalid input (with NaNs)
+ * Include iOS build file
+ * Various platform build fixes and improvements
+
+The API is unchanged and the library is binary compatible with
+version 1.7.
+
+	
 Changes in Rubber Band v1.8.1
 
  * Fix a crash in formant-preserving pitch shift for some build targets
diff --git a/Makefile.in b/Makefile.in
index ed1840b..3a70a71 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -31,7 +31,7 @@ JNINAME			:= librubberband-jni
 JARNAME			:= rubberband.jar
 
 DYNAMIC_EXTENSION	:= .so
-DYNAMIC_FULL_VERSION	:= 2.1.0
+DYNAMIC_FULL_VERSION	:= 2.1.1
 DYNAMIC_ABI_VERSION	:= 2
 DYNAMIC_LDFLAGS		:= -shared -Wl,-Bsymbolic -Wl,-soname=$(LIBNAME)$(DYNAMIC_EXTENSION).$(DYNAMIC_ABI_VERSION)
 VAMP_LDFLAGS		:= -shared -Wl,-Bsymbolic -Wl,--version-script=vamp/vamp-plugin.map
diff --git a/Makefile.osx b/Makefile.osx
index 3b1fc7f..4375188 100644
--- a/Makefile.osx
+++ b/Makefile.osx
@@ -29,7 +29,7 @@ INSTALL_PKGDIR		:= $(PREFIX)/lib/pkgconfig
 LIBNAME			:= librubberband
 
 DYNAMIC_EXTENSION	:= .dylib
-DYNAMIC_FULL_VERSION	:= 2.1.0
+DYNAMIC_FULL_VERSION	:= 2.1.1
 DYNAMIC_ABI_VERSION	:= 2
 DYNAMIC_LDFLAGS		:= -dynamiclib -install_name $(INSTALL_LIBDIR)/$(LIBNAME).$(DYNAMIC_ABI_VERSION)$(DYNAMIC_EXTENSION) -current_version $(DYNAMIC_FULL_VERSION) -compatibility_version $(DYNAMIC_ABI_VERSION)
 
diff --git a/README.txt b/README.txt
index d8d55c0..2180fba 100644
--- a/README.txt
+++ b/README.txt
@@ -246,14 +246,16 @@ The following Makefile targets are available:
 The default target is "all".
 
 
-4d. OS/X and iOS
-----------------
+4d. OS/X
+--------
 
 A Makefile for OS/X is provided as Makefile.osx.
 
 Adjust the Makefile according to your preference for compiler and
 platform SDK, FFT and resampler implementations.  The default is to
-use the Accelerate framework and the Speex resampler.
+use the Accelerate framework and the Speex resampler.  Then run
+e.g. "make -f Makefile.osx library" in a terminal window to build.
+You will need the Xcode command-line tools installed.
 
 The following Makefile targets are available:
 
@@ -275,8 +277,32 @@ for RubberBandStretcherJNI.cpp) and the API headers in rubberband/
 should be all you need.
 
 Note that you cannot legally distribute applications using Rubber Band
-through the iPhone/iPad App Store or OS/X App Store unless you have a
-valid commercial licence.  GPL code is not permitted in these stores.
+in the Mac App Store, unless you have first obtained a commercial
+licence for the Rubber Band Library.  GPL code is not permitted in the
+app store.  See http://breakfastquay.com/technology/license.html for
+commercial terms.
+
+
+4d. iOS
+-------
+
+A Makefile for iOS is provided as Makefile.ios.  It produces a single
+static library containing both simulator and device binaries, in both
+32- and 64-bit architectures.
+
+Run e.g. "make -f Makefile.ios" in a terminal window to build.  You
+will need the Xcode command-line tools installed.
+
+If you prefer to add the Rubber Band library files to an existing
+build project instead of using the Makefile, the files in src/ (except
+for RubberBandStretcherJNI.cpp) and the API headers in rubberband/
+should be all you need.
+
+Note that you cannot legally distribute applications using Rubber Band
+in the iOS App Store, unless you have a first obtained a commercial
+licence for the Rubber Band Library. GPL code is not permitted in the
+app store.  See http://breakfastquay.com/technology/license.html for
+commercial terms.
 
 
 4e. Win32 and Visual Studio
diff --git a/configure.ac b/configure.ac
index c157f46..eef571b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 
-AC_INIT(RubberBand, 1.9, chris.cannam@breakfastquay.com)
+AC_INIT(RubberBand, 1.8.2, chris.cannam@breakfastquay.com)
 
 AC_CONFIG_SRCDIR(src/StretcherImpl.h)
 AC_PROG_CXX
diff --git a/rubberband/RubberBandStretcher.h b/rubberband/RubberBandStretcher.h
index c6f81ce..cba1cd2 100644
--- a/rubberband/RubberBandStretcher.h
+++ b/rubberband/RubberBandStretcher.h
@@ -24,7 +24,7 @@
 #ifndef _RUBBERBANDSTRETCHER_H_
 #define _RUBBERBANDSTRETCHER_H_
     
-#define RUBBERBAND_VERSION "1.8.1"
+#define RUBBERBAND_VERSION "1.8.2"
 #define RUBBERBAND_API_MAJOR_VERSION 2
 #define RUBBERBAND_API_MINOR_VERSION 5