diff --git a/general.ent b/general.ent
index 3d40299099..38ecc58fab 100644
--- a/general.ent
+++ b/general.ent
@@ -1016,7 +1016,7 @@ $Date$
 <!ENTITY blueman-version              "1.23">
 <!ENTITY gparted-version              "0.12.1">
 <!ENTITY gnash-version                "0.8.10">
-<!ENTITY gimp-version                 "2.8.0">
+<!ENTITY gimp-version                 "2.8.2">
 <!ENTITY icedtea-web-version          "1.2">
 <!ENTITY inkscape-version             "0.48.3.1">
 <!ENTITY pan-version                  "0.133">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index ad5abf2ec2..09303f56ab 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -55,6 +55,9 @@
         <listitem>
           <para>[krejzi] - ALSA Utilities 1.0.26.</para>
         </listitem>
+        <listitem>
+          <para>[krejzi] - Gimp 2.8.2.</para>
+        </listitem>
         <listitem>
           <para>[krejzi] - Linux PAM 1.1.6.</para>
         </listitem>
diff --git a/xsoft/other/gimp.xml b/xsoft/other/gimp.xml
index 9533364edd..885e745612 100644
--- a/xsoft/other/gimp.xml
+++ b/xsoft/other/gimp.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY gimp-download-http "http://artfiles.org/gimp.org/gimp/v2.8/gimp-&gimp-version;.tar.bz2">
   <!ENTITY gimp-download-ftp  "ftp://ftp.gimp.org/pub/gimp/v2.8/gimp-&gimp-version;.tar.bz2">
-  <!ENTITY gimp-md5sum        "28997d14055f15db063eb92e1c8a7ebb">
+  <!ENTITY gimp-md5sum        "b542138820ca3a41cbd63fc331907955">
   <!ENTITY gimp-size          "20 MB">
-  <!ENTITY gimp-buildsize     "607 MB (additonal 579 MB to run the test suite, the help files add from 267 MB (en only) to 1.3 GB (all), typically increasing by 60 MB per translation)">
-  <!ENTITY gimp-time          "4.9 SBU (additional 0.9 SBU to run the test suite, for the help files from 0.7 SBU (en only) to 29 SBU (all) - typically 1.5 SBU per translation)">
+  <!ENTITY gimp-buildsize     "570 MB (additonal 580 MB to run the test suite, the help files add from 267 MB (en only) to 1.3 GB (all), typically increasing by 60 MB per translation)">
+  <!ENTITY gimp-time          "4.9 SBU (additional 1.2 SBU to run the test suite, for the help files from 0.7 SBU (en only) to 29 SBU (all) - typically 1.5 SBU per translation)">
 
   <!ENTITY gimp-help-version  "2.8.0">
   <!ENTITY gimp-help-download "ftp://gimp.org/pub/gimp/help/gimp-help-&gimp-help-version;.tar.bz2">
@@ -89,16 +89,19 @@
     <bridgehead renderas="sect3">Gimp Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="fontconfig"/>,
-    <xref linkend="gegl"/>,
-    <xref linkend="intltool"/>,
-    <xref linkend="gtk2"/></para>
+    <para role="required">
+      <xref linkend="gegl"/>,
+      <xref linkend="gtk2"/> and
+      <xref linkend="intltool"/>
+    </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="libpng"/>,
-    <xref linkend="libjpeg"/>,
-    <xref linkend="libtiff"/> and
-    <xref linkend="pygtk"/> (including the gtk and pango modules).</para>
+    <para role="recommended">
+      <xref linkend="libjpeg"/>,
+      <xref linkend="libpng"/>,
+      <xref linkend="libtiff"/> and
+      <xref linkend="pygtk"/> (including the gtk and pango modules).
+    </para>
 
     <note>
       <para>If the recommended dependencies are not installed, the
@@ -107,27 +110,29 @@
     </note>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="aalib"/>,
-    <xref linkend="alsa-lib"/>,
-    <xref linkend="curl"/>,
-    <xref linkend="dbus-glib"/>,
-    <xref linkend="iso-codes"/>,
-    <xref linkend="lcms"/>,
-    <xref linkend="libexif"/>,
-    <xref linkend="librsvg"/>,
-    <ulink url="http://wvware.sourceforge.net/libwmf.html">libwmf</ulink>,
-    <xref linkend="poppler"/>,
-    an <xref linkend="server-mail"/> (that provides a
-    <command>sendmail</command> program),
-    <xref linkend="webkitgtk"/> (this must be compiled with the
-    <application>gtk+-2</application> backend for the
-    <application>Gimp</application> to use it to create its help browser)
-    and <xref linkend="gtk-doc"/></para>
+    <para role="optional">
+      <xref linkend="aalib"/>,
+      <xref linkend="alsa-lib"/>,
+      <xref linkend="curl"/>,
+      <xref linkend="dbus-glib"/>,
+      <xref linkend="iso-codes"/>,
+      <xref linkend="lcms"/>,
+      <xref linkend="libexif"/>,
+      <xref linkend="librsvg"/>,
+      <ulink url="http://wvware.sourceforge.net/libwmf.html">libwmf</ulink>,
+      <xref linkend="poppler"/>,
+      an <xref linkend="server-mail"/> (that provides a
+      <command>sendmail</command> program),
+      <xref linkend="webkitgtk"/> (this must be compiled with the
+      <application>GTK+ 2</application> backend for the
+      <application>Gimp</application> to use it to create its help browser)
+      and <xref linkend="gtk-doc"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional, for the help files</bridgehead>
     <para role="optional">
-    <ulink url="http://pngnq.sourceforge.net/">pngnq</ulink> and
-    <ulink url="http://pmt.sourceforge.net/pngcrush/">pngcrush</ulink>
+      <ulink url="http://pngnq.sourceforge.net/">pngnq</ulink> and
+      <ulink url="http://pmt.sourceforge.net/pngcrush/">pngcrush</ulink>
     </para>
 
     <para condition="html" role="usernotes">User Notes: