diff -Nru haskell-syb-with-class-0.6.1.6/debian/changelog haskell-syb-with-class-0.6.1.6/debian/changelog
--- haskell-syb-with-class-0.6.1.6/debian/changelog	2015-06-29 11:32:31.000000000 +0000
+++ haskell-syb-with-class-0.6.1.6/debian/changelog	2015-12-03 20:16:47.000000000 +0000
@@ -1,3 +1,17 @@
+haskell-syb-with-class (0.6.1.6-3) unstable; urgency=medium
+
+  * Switch Vcs-Git/Vcs-Browser headers to new location.
+
+ -- Clint Adams <clint@debian.org>  Thu, 03 Dec 2015 14:55:07 -0500
+
+haskell-syb-with-class (0.6.1.6-2) experimental; urgency=medium
+
+  * Bump standards-version to 3.9.6
+  * Depend on haskell-devscripts >= 0.10 to ensure that this package
+    builds against GHC in experimental
+
+ -- Joachim Breitner <nomeata@debian.org>  Thu, 20 Aug 2015 10:28:47 +0200
+
 haskell-syb-with-class (0.6.1.6-1) unstable; urgency=medium
 
   * New upstream release
@@ -68,7 +82,7 @@
 haskell-syb-with-class (0.6.1-1) unstable; urgency=low
 
   * Adopt by the Debian Haskell Group
-  * New upstream release 
+  * New upstream release
 
  -- Joachim Breitner <nomeata@debian.org>  Sat, 20 Feb 2010 20:22:41 +0100
 
@@ -98,4 +112,3 @@
   * Initial release (Closes: #432794)
 
  -- Kari Pahula <kaol@debian.org>  Mon, 03 Mar 2008 19:09:15 +0200
-
diff -Nru haskell-syb-with-class-0.6.1.6/debian/control haskell-syb-with-class-0.6.1.6/debian/control
--- haskell-syb-with-class-0.6.1.6/debian/control	2015-04-27 09:46:28.000000000 +0000
+++ haskell-syb-with-class-0.6.1.6/debian/control	2015-12-03 19:19:50.000000000 +0000
@@ -1,27 +1,28 @@
 Source: haskell-syb-with-class
-Section: haskell
-Priority: extra
 Maintainer: Debian Haskell Group <pkg-haskell-maintainers@lists.alioth.debian.org>
 Uploaders: Joachim Breitner <nomeata@debian.org>
-Build-Depends: debhelper (>= 9)
-  , cdbs
-  , haskell-devscripts (>= 0.9)
-  , ghc
-  , ghc-prof
-  , ghc-ghci
-Standards-Version: 3.9.4
+Priority: extra
+Section: haskell
+Build-Depends: debhelper (>= 9),
+ haskell-devscripts (>= 0.10),
+ cdbs,
+ ghc,
+ ghc-prof,
+ ghc-ghci,
+Build-Depends-Indep: ghc-doc,
+Standards-Version: 3.9.6
 Homepage: http://hackage.haskell.org/package/syb-with-class
-Vcs-Darcs: http://darcs.debian.org/pkg-haskell/haskell-syb-with-class
-Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-syb-with-class
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-haskell/DHG_packages.git/
+Vcs-Git: git://git.debian.org/git/pkg-haskell/DHG_packages.git
 
 Package: libghc-syb-with-class-dev
 Architecture: any
-Depends: ${haskell:Depends}
-  , ${shlibs:Depends}
-  , ${misc:Depends}
-Recommends: ${haskell:Recommends}
-Suggests: ${haskell:Suggests}
-Provides: ${haskell:Provides}
+Depends: ${haskell:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends},
+Recommends: ${haskell:Recommends},
+Suggests: ${haskell:Suggests},
+Provides: ${haskell:Provides},
 Description: Haskell library for generic programming${haskell:ShortBlurb}
  The "Scrap your boilerplate" approach is a lightweight generic
  programming approach for Haskell.  Using this approach, you can write
@@ -33,12 +34,12 @@
 
 Package: libghc-syb-with-class-prof
 Architecture: any
-Depends: ${haskell:Depends}
-  , ${shlibs:Depends}
-  , ${misc:Depends}
-Recommends: ${haskell:Recommends}
-Suggests: ${haskell:Suggests}
-Provides: ${haskell:Provides}
+Depends: ${haskell:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends},
+Recommends: ${haskell:Recommends},
+Suggests: ${haskell:Suggests},
+Provides: ${haskell:Provides},
 Description: Haskell library for generic programming${haskell:ShortBlurb}
  The "Scrap your boilerplate" approach is a lightweight generic
  programming approach for Haskell.  Using this approach, you can write
@@ -51,13 +52,12 @@
  This package contains the profiling libraries.
 
 Package: libghc-syb-with-class-doc
-Section: doc
 Architecture: all
-Depends:
- ${haskell:Depends},
- ${misc:Depends}
-Suggests: ${haskell:Suggests}
-Recommends: ${haskell:Recommends}
+Section: doc
+Depends: ${haskell:Depends},
+ ${misc:Depends},
+Recommends: ${haskell:Recommends},
+Suggests: ${haskell:Suggests},
 Description: Haskell library for generic programming${haskell:ShortBlurb}
  The "Scrap your boilerplate" approach is a lightweight generic
  programming approach for Haskell.  Using this approach, you can write
diff -Nru haskell-syb-with-class-0.6.1.6/debian/copyright haskell-syb-with-class-0.6.1.6/debian/copyright
--- haskell-syb-with-class-0.6.1.6/debian/copyright	2015-04-27 09:46:28.000000000 +0000
+++ haskell-syb-with-class-0.6.1.6/debian/copyright	2015-07-16 00:45:53.000000000 +0000
@@ -3,14 +3,14 @@
 
 It was downloaded from http://hackage.haskell.org/packages/archive/syb-with-class/
 
-Upstream Authors: 
+Upstream Authors:
 
     The University of Glasgow, CWI,
     Simon Peyton Jones, Ralf Laemmel,
     Ulf Norell, Sean Seefried, Simon D. Foster,
     HAppS LLC
 
-Copyright: 
+Copyright:
 
     2004-2008	The University of Glasgow, CWI,
 		Simon Peyton Jones, Ralf Laemmel,
@@ -35,7 +35,7 @@
     OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
     SUCH DAMAGE.
 
-On Debian systems, the complete text of the BSD License can be 
+On Debian systems, the complete text of the BSD License can be
 found in `/usr/share/common-licenses/BSD'.
 
 The Debian packaging is © 2008, Kari Pahula <kaol@debian.org> and is