diff --git a/cabal-debian.cabal b/cabal-debian.cabal
--- a/cabal-debian.cabal
+++ b/cabal-debian.cabal
@@ -1,5 +1,5 @@
 Name:           cabal-debian
-Version:        3.5
+Version:        3.7
 License:        BSD3
 License-File:   debian/copyright
 Author:         David Fox <dsf@seereason.com>
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+haskell-cabal-debian (3.7) unstable; urgency=low
+
+  * Change path to hackage tarball in watch file for hackage2.
+
+ -- David Fox <dsf@seereason.com>  Fri, 04 Oct 2013 09:22:51 -0700
+
+haskell-cabal-debian (3.6) unstable; urgency=low
+
+  * Require haskell-devscripts >= 0.8.19.  This version changes the
+    value of datasubdir from /usr/share/packagename-packageversion to
+    simply /usr/share/packagename.  This could break some packaging.
+
+ -- David Fox <dsf@seereason.com>  Fri, 06 Sep 2013 16:48:18 -0700
+
 haskell-cabal-debian (3.5) unstable; urgency=low
 
   * Allow full lists of debian relations to be passed to the --build-dep
diff --git a/src/Debian/Debianize/Atoms.hs b/src/Debian/Debianize/Atoms.hs
--- a/src/Debian/Debianize/Atoms.hs
+++ b/src/Debian/Debianize/Atoms.hs
@@ -375,7 +375,7 @@
     where
       g atoms =
           fmap (\ p -> let PackageName pkgname = pkgName. package $ p in
-                       "usr/share" </> (pkgname ++ "-" ++ (showVersion . pkgVersion . package $ p))) (getL packageDescription atoms)
+                       "usr/share" </> pkgname) (getL packageDescription atoms)
       s _ _ = error "setL dataDir"
 
 
diff --git a/src/Debian/Debianize/Goodies.hs b/src/Debian/Debianize/Goodies.hs
--- a/src/Debian/Debianize/Goodies.hs
+++ b/src/Debian/Debianize/Goodies.hs
@@ -172,7 +172,7 @@
 watchAtom :: PackageName -> Text
 watchAtom (PackageName pkgname) =
     pack $ "version=3\nopts=\"downloadurlmangle=s|archive/([\\w\\d_-]+)/([\\d\\.]+)/|archive/$1/$2/$1-$2.tar.gz|,\\\nfilenamemangle=s|(.*)/$|" ++ pkgname ++
-           "-$1.tar.gz|\" \\\n    http://hackage.haskell.org/packages/archive/" ++ pkgname ++
+           "-$1.tar.gz|\" \\\n    http://hackage.haskell.org/package/" ++ pkgname ++
            " \\\n    ([\\d\\.]*\\d)/\n"
 
 siteAtoms :: BinPkgName -> Site -> Atoms -> Atoms