diff --git a/debian/changelog b/debian/changelog
index 2fc4514..f0bcb52 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,30 @@
+sugar-etoys-activity (116-4) unstable; urgency=medium
+
+  * Remove Ankur khurana as uploader (email bounces).
+    Thanks for your contributions, Ankur.
+  * Move packaging to Debian Sugar Team.
+  * Declare compliance with Debian Policy 3.9.6.
+  * Drop ${shlibs:Depends} superfluous for arch-all.
+  * Rewrite README.source to emphasize that control.in file is *not* a
+    show-stopper for contributions, and refer to wiki page for details.
+  * Bump debhelper compatibility level to 8.
+  * Update Homepage.
+  * Modernize short and long description.
+  * Add patch to us sugar-toolkit-gtk3.
+  * Git-ignore quilt .pc dir, and have git-buildpackage ignore the
+    .git-ignore file.
+  * Update copyright info:
+    + Extend coverage for myself.
+    + Relicense packaging as GPL-3+.
+    + License patch dir same as upstream.
+  * Update package relations:
+    + Fix stop recommend sugar-session-* or sugar-presence-service-*.
+    + Build-depend on python-sugar3 (not python-sugar-* or
+      python-sugar-toolkit-*).
+    + Fix explicitly depend on python.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Wed, 22 Apr 2015 22:47:45 +0200
+
 sugar-etoys-activity (116-3) unstable; urgency=low
 
   * Update package relations:
diff --git a/debian/control b/debian/control
index 977a87b..769a7d2 100644
--- a/debian/control
+++ b/debian/control
@@ -1,38 +1,38 @@
 Source: sugar-etoys-activity
 Section: contrib/x11
 Priority: optional
-Maintainer: Debian OLPC <debian-olpc-devel@lists.alioth.debian.org>
-Uploaders: Ankur khurana <ankur@seeta.in>,
- Jonas Smedegaard <dr@jones.dk>,
+Maintainer: Debian Sugar Team <pkg-sugar-devel@lists.alioth.debian.org>
+Uploaders: Jonas Smedegaard <dr@jones.dk>,
  Luke Faraone <lfaraone@debian.org>
-Build-Depends: devscripts,
- python (>= 2.6.5),
- cdbs (>= 0.4.97~),
+Build-Depends: cdbs (>= 0.4.90~),
+ devscripts,
  debhelper,
  dh-buildinfo,
- python-sugar-0.88 | python-sugar,
- python-sugar-toolkit-0.88 | python-sugar-toolkit,
+ python,
+ python-sugar3,
  unzip
-Standards-Version: 3.9.3
-Vcs-Git: git://git.debian.org/collab-maint/sugar-etoys-activity.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/sugar-etoys-activity.git
-Homepage: http://wiki.laptop.org/go/Etoys
+Standards-Version: 3.9.6
+Vcs-Git: git://anonscm.debian.org/pkg-sugar/sugar-etoys-activity.git
+Vcs-Browser: http://anonscm.debian.org/cgit/pkg-sugar/sugar-etoys-activity.git
+Homepage: https://wiki.sugarlabs.org/go/Activities/Etoys
 
 Package: sugar-etoys-activity
 Architecture: all
 Depends: ${cdbs:Depends},
  ${misc:Depends},
- ${python:Depends},
- ${shlibs:Depends}
-Recommends: ${cdbs:Recommends}
-Sugests: ${cdbs:Suggests}
+ ${python:Depends}
 Provides: ${python:Provides}
-Description: Sugar wrapper around the Squeak Etoys programming language
- Sugar is a desktop environment. It is conceived as a platform upon
- which children learn with Sugar Activities. The platform provides
- mechanisms for collaboration, reflection, and exploration. Sugar
- Activities cover a broad range of applications: browsing, drawing,
- composing, writing, programming, etc.
+Description: Etoys activity for Sugar Learning Platform
+ Sugar Learning Platform promotes collaborative learning through Sugar
+ Activities that encourage critical thinking, the heart of a quality
+ education.  Designed from the ground up especially for children, Sugar
+ offers an alternative to traditional “office-desktop” software.
+ .
+ Learner applications in Sugar are called Activities.  They are software
+ packages that automatically save your work - producing specific
+ instances of the Activity that can be resumed at a later time.  Many
+ Activities support learner collaboration, where multiple learners may
+ be invited to join a collective Activity session.
  .
  Squeak Etoys was inspired by LOGO, PARC-Smalltalk, Hypercard, and
  starLOGO. It is a media-rich authoring environment with a simple,
diff --git a/debian/control.in b/debian/control.in
index 6353030..9b9225f 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -15,7 +15,6 @@
 Depends: ${cdbs:Depends},
  ${misc:Depends},
  ${python:Depends}
-Recommends: ${cdbs:Recommends}
 Provides: ${python:Provides}
 Description: Etoys activity for Sugar Learning Platform
  Sugar Learning Platform promotes collaborative learning through Sugar
diff --git a/debian/copyright_hints b/debian/copyright_hints
index f4dd016..22d6f23 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -19,23 +19,24 @@
  debian/control
  debian/control.in
  debian/gbp.conf
+ debian/patches/1001_use_toolkit-gtk3.patch
+ debian/patches/README
+ debian/patches/series
  debian/source/format
- debian/sugar-etoys-activity.lintian-overrides
  debian/watch
  setup.py
 Copyright: *No copyright*
 License: UNKNOWN
  FIXME
 
-Files: debian/rules
-Copyright: 2008-2010, 2012 Jonas Smedegaard <dr@jones.dk>
-  2010, Ankur khurana <ankur@seeta.in>
-License: GPL-2+
+Files: COPYING
+Copyright: 2006-2008, Viewpoints Research Institute, and Contributors
+License: Expat
  FIXME
 
-Files: COPYING
-Copyright: 2006-2008, Viewpoints Research Institute, and Contributors
-  HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-License: MIT/X11 (BSD like)
+Files: debian/rules
+Copyright: 2010, 2012, 2015, Jonas Smedegaard <dr@jones.dk>
+  2010, Ankur khurana <ankur@seeta.in>
+License: GPL-3+
  FIXME