diff --git a/ChangeLog b/ChangeLog
index 33dbb2c7d..43e02417c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2009-06-02 14:44  robert
+
+	* src/osg/Texture2D.cpp: Merged from svn/trunk : "Moved assigned of
+	  texture object to
+	  _textureObjectBuffer to earlier in Texture2D::apply() to prevent
+	  problems with non power of two texture mipmap generation."
+
+2009-06-02 14:42  robert
+
+	* ChangeLog, NEWS.txt: Updated ChangeLog and NEWS.txt in prep for
+	  2.8.2
+
 2009-06-02 09:23  robert
 
 	* CMakeLists.txt, include/osg/Version: Updated version numbers for
diff --git a/NEWS.txt b/NEWS.txt
index e4d40fb33..35208d875 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -11,9 +11,10 @@ The !OpenSceneGraph 2.8.2 release is the culmination of 10 years of work by the
 === Updates between 2.8.2 and 2.8.1 releases include: ===
 
   * Bug fixes to :
-    * regression in X11 key symbol remapping, improved support for Russian keyboards.
+    * texture generate mipmap for non power of two textures
+    * regression in X11 key symbol remapping, improved support for Russian keyboards
     * regression of StencilMask setting in RenderStage
-    * small memory leak in X11 usage.
+    * small memory leak in X11 usage
     * Transform::computeBound() double BoundingSphere support
     * Resize handling when master and slave Cameras share the same GraphicsContext