diff --git a/AUTHORS b/AUTHORS
index 41b2cb6ed6..22d911b573 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -8,7 +8,6 @@ GIMP was originally written by:
 
 The current maintainers are:
 
- Sven Neumann
  Michael Natterer
 
 
@@ -192,11 +191,12 @@ The following people have contributed code to GIMP:
  Felix Natter
  David Neary
  David Necas
+ Sven Neumann
  Andreas Neustifter
- Stephen Robert Norris
  Tim Newsome
  Jon Nordby
  Martin Nordholts
+ Stephen Robert Norris
  Erik Nygren
  Miles O'Neal
  David Odin
diff --git a/MAINTAINERS b/MAINTAINERS
index 98dce61e22..256bd5a385 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4,7 +4,3 @@ Currently active maintainers
 Michael Natterer
 E-mail: mitch@gimp.org
 Userid: mitch
-
-Sven Neumann
-E-mail: sven@gimp.org
-Userid: neo
diff --git a/desktop/gimp.appdata.xml.in b/desktop/gimp.appdata.xml.in
index 78145ddd4e..83008ad711 100644
--- a/desktop/gimp.appdata.xml.in
+++ b/desktop/gimp.appdata.xml.in
@@ -26,7 +26,7 @@
       augmented with plug-ins and extensions to do just about
       anything. The advanced scripting interface allows everything
       from the simplest task to the most complex image manipulation
-      procedures to be easily scripted. GIMP is also available for
+      procedures to be easily scripted. GIMP is available for Linux,
       Microsoft Windows and OS X.
     </_p>
   </description>
diff --git a/gimp.doap b/gimp.doap
index 827c0e42e3..f96dd29e7b 100644
--- a/gimp.doap
+++ b/gimp.doap
@@ -5,17 +5,55 @@
          xmlns="http://usefulinc.com/ns/doap#">
 
   <name xml:lang="en">GIMP</name>
-  <shortdesc xml:lang="en">GNU Image Manipulation Program</shortdesc>
-  <homepage rdf:resource="http://www.gimp.org" />
-  <mailing-list rdf:resource="http://gimp.org/mail_lists.html" />
-  <category rdf:resource="http://api.gnome.org/doap-extensions#productivity" />
 
-  <maintainer>
-    <foaf:Person>
-      <foaf:name>Sven Neumann</foaf:name>
-      <gnome:userid>neo</gnome:userid>
-    </foaf:Person>
-  </maintainer>
+  <shortdesc xml:lang="en">GNU Image Manipulation Program</shortdesc>
+
+  <description xml:lang="en">
+      GIMP is an acronym for GNU Image Manipulation Program. It is a
+      freely distributed program for such tasks as photo retouching,
+      image composition and image authoring.
+      It has many capabilities. It can be used as a simple paint
+      program, an expert quality photo retouching program, an online
+      batch processing system, a mass production image renderer, an
+      image format converter, etc.
+      GIMP is expandable and extensible. It is designed to be
+      augmented with plug-ins and extensions to do just about
+      anything. The advanced scripting interface allows everything
+      from the simplest task to the most complex image manipulation
+      procedures to be easily scripted. GIMP is available for Linux,
+      Windows and OS X.
+  </description>
+  <description xml:lang="de">
+      GIMP ist die Abkürzung für GNU Image Manipulation Program.
+      Es ist ein frei verfügbares Programm für Aufgaben wie Fotoretusche,
+      Bildgestaltung und Bildbearbeitung.
+      GIMP hat viele Fähigkeiten. Sie können es verwenden für einfache
+      Zeichenaufgabben, professionelle Fotoretuschen, die Online-
+      Stapelverarbeitung, Bildrendering in der Massenproduktion,
+      die Umwandlung von Grafikdateien und vieles mehr.
+      GIMP ist durch Plug-ins erweiterungsfähig.
+      Mithilfe der Programmierschnittstelle von GIMP können Sie einfache
+      Aufgaben wie auch komplexe Bildverarbeitungprozeduren automatisieren.
+      GIMP steht Ihnen unter Linux, Windows und OS X zur Verfügung.
+  </description>
+
+  <homepage rdf:resource="http://www.gimp.org" />
+
+  <mailing-list rdf:resource="http://gimp.org/mail_lists.html" />
+
+  <category rdf:resource="http://api.gnome.org/doap-extensions#apps" />
+
+  <download-page rdf:resource="http:///www.gimp.org/downloads/" />
+
+  <bug-database
+    rdf:resource="https://bugzilla.gnome.org/browse.cgi?product=GIMP"
+  />
+
+  <programming-language>C</programming-language>
+  <programming-language>Perl</programming-language>
+  <programming-language>Python</programming-language>
+  <programming-language>Shell</programming-language>
+  <programming-language>XSLT</programming-language>
 
   <maintainer>
     <foaf:Person>
@@ -23,7 +61,6 @@
       <gnome:userid>mitch</gnome:userid>
     </foaf:Person>
   </maintainer>
-
   <maintainer>
     <foaf:Person>
       <foaf:name>Michael Schumacher</foaf:name>
@@ -31,4 +68,6 @@
     </foaf:Person>
   </maintainer>
 
+<!-- TODO: generate MAINTAINERS from this file -->
+
 </Project>