diff --git a/servant-client/servant-client.cabal b/servant-client/servant-client.cabal
index 512b64bd..4bae2e89 100644
--- a/servant-client/servant-client.cabal
+++ b/servant-client/servant-client.cabal
@@ -26,10 +26,10 @@ build-type:          Simple
 cabal-version:       >=1.10
 tested-with:         GHC >= 7.8
 homepage:            http://haskell-servant.github.io/
-Bug-reports:         http://github.com/haskell-servant/servant-client/issues
+Bug-reports:         http://github.com/haskell-servant/servant/issues
 source-repository head
   type: git
-  location: http://github.com/haskell-servant/servant-client.git
+  location: http://github.com/haskell-servant/servant.git
 
 library
   exposed-modules:
diff --git a/servant-docs/servant-docs.cabal b/servant-docs/servant-docs.cabal
index 35591972..09c0fbf2 100644
--- a/servant-docs/servant-docs.cabal
+++ b/servant-docs/servant-docs.cabal
@@ -15,13 +15,13 @@ build-type:          Simple
 cabal-version:       >=1.10
 tested-with:         GHC >= 7.8
 homepage:            http://haskell-servant.github.io/
-Bug-reports:         http://github.com/haskell-servant/servant-docs/issues
+Bug-reports:         http://github.com/haskell-servant/servant/issues
 extra-source-files:
   CHANGELOG.md
   README.md
 source-repository head
   type: git
-  location: http://github.com/haskell-servant/servant-docs.git
+  location: http://github.com/haskell-servant/servant.git
 
 library
   exposed-modules:
diff --git a/servant-jquery/servant-jquery.cabal b/servant-jquery/servant-jquery.cabal
index e6acc9ff..2f63cac6 100644
--- a/servant-jquery/servant-jquery.cabal
+++ b/servant-jquery/servant-jquery.cabal
@@ -4,8 +4,9 @@ synopsis:            Automatically derive (jquery) javascript functions to query
 description:
   Automatically derive jquery-based javascript functions to query servant webservices.
   .
-  Example <https://github.com/haskell-servant/servant-jquery/blob/master/examples/counter.hs here> that serves the generated javascript to a webpage that lets you
-  trigger webservice calls.
+  You can find an example <https://github.com/haskell-servant/servant/blob/master/servant-jquery/examples/counter.hs here>
+  which serves the generated javascript to a webpage that allows you to trigger
+  webservice calls.
 license:             BSD3
 license-file:        LICENSE
 author:              Alp Mestanogullari
@@ -15,13 +16,13 @@ category:            Web
 build-type:          Simple
 cabal-version:       >=1.10
 homepage:            http://haskell-servant.github.io/
-Bug-reports:         http://github.com/haskell-servant/servant-jquery/issues
+Bug-reports:         http://github.com/haskell-servant/servant/issues
 extra-source-files:
   CHANGELOG.md
   README.md
 source-repository head
   type: git
-  location: http://github.com/haskell-servant/servant-jquery.git
+  location: http://github.com/haskell-servant/servant.git
 
 flag example
   description: Build the example too
diff --git a/servant-server/servant-server.cabal b/servant-server/servant-server.cabal
index 75a54ba8..e3ed0ebb 100644
--- a/servant-server/servant-server.cabal
+++ b/servant-server/servant-server.cabal
@@ -4,12 +4,14 @@ synopsis:            A family of combinators for defining webservices APIs and s
 description:
   A family of combinators for defining webservices APIs and serving them
   .
-  You can learn about the basics in <http://haskell-servant.github.io/getting-started/ the getting started> guide.
+  You can learn about the basics in <http://haskell-servant.github.io/getting-started/ the getting started>
+  guide.
   .
-  <https://github.com/haskell-servant/servant-server/blob/master/example/greet.hs Here>'s a runnable example, with comments, that defines a dummy API and
-  implements a webserver that serves this API, using this package.
+  <https://github.com/haskell-servant/servant/blob/master/servant-server/example/greet.hs Here>
+  is a runnable example, with comments, that defines a dummy API and implements
+  a webserver that serves this API, using this package.
 homepage:            http://haskell-servant.github.io/
-Bug-reports:         http://github.com/haskell-servant/servant-server/issues
+Bug-reports:         http://github.com/haskell-servant/servant/issues
 license:             BSD3
 license-file:        LICENSE
 author:              Alp Mestanogullari, Sönke Hahn, Julian K. Arni