diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -116,14 +116,14 @@
     is no proper Cabal file for them, or because their builds are so
     complicated that the `cabal.nix` build doesn't suffice to do the
     trick. The list of bad packages is hard-coded into
-    [`hackage4nix.hs`](http://github.com/NixOS/cabal2nix/blob/master/src/Hackage4Nix.hs),
+    [`hackage4nix.hs`](http://github.com/peti/cabal2nix/blob/master/src/Hackage4Nix.hs),
     in the functions `badPackagePaths` and `patchedPackages`. Any
     package list in there is going to be ignored by `hackage4nix`.
 
 *   "Patched packages" cannot be generated automatically, because their
     build instructions need patches that `cabal2nix` doesn't (yet) know
     about. There is a hard-coded list of patched packages in
-    [`hackage4nix`](http://github.com/NixOS/cabal2nix/blob/master/src/Hackage4Nix.hs).
+    [`hackage4nix`](http://github.com/peti/cabal2nix/blob/master/src/Hackage4Nix.hs).
     Furthermore, all build expressions that define any of the attributes
 
         (pre|post)Configure
@@ -132,7 +132,7 @@
         patches
 
     are considered "patched". That list of attributes is hard-coded in
-    [`hackage4nix.hs`](http://github.com/NixOS/cabal2nix/blob/master/src/Hackage4Nix.hs)
+    [`hackage4nix.hs`](http://github.com/peti/cabal2nix/blob/master/src/Hackage4Nix.hs)
     in the function `regenerateDerivation`.
 
 The complete list of Haskell packages available in Nix is generated by
diff --git a/cabal2nix.cabal b/cabal2nix.cabal
--- a/cabal2nix.cabal
+++ b/cabal2nix.cabal
@@ -1,11 +1,11 @@
 Name:                   cabal2nix
-Version:                1.34
+Version:                1.35
 Copyright:              Peter Simons, Andres Loeh
 License:                BSD3
 License-File:           LICENSE
-Author:                 Peter Simons <simons@cryp.to>, Andres Loeh <mail@andres-loeh.de>
-Maintainer:             Nix Developers <nix-dev@lists.science.uu.nl>
-Homepage:               http://github.com/NixOS/cabal2nix
+Author:                 Peter Simons, Andres Loeh
+Maintainer:             Peter Simons <simons@cryp.to>
+Homepage:               http://github.com/peti/cabal2nix
 Category:               Distribution
 Synopsis:               Convert Cabal files into Nix build instructions
 Cabal-Version:          >= 1.8
@@ -31,8 +31,8 @@
   .
   The only required argument is the path to the cabal file. For example:
   .
-  > cabal2nix http://hackage.haskell.org/packages/archive/cabal2nix/1.34/cabal2nix.cabal
-  > cabal2nix cabal://cabal2nix-1.34
+  > cabal2nix http://hackage.haskell.org/packages/archive/cabal2nix/1.35/cabal2nix.cabal
+  > cabal2nix cabal://cabal2nix-1.35
   .
   If the @--sha256@ option has not been specified, cabal2nix calls
   @nix-prefetch-url@ to determine the hash automatically. This causes
@@ -40,7 +40,7 @@
 
 Source-Repository head
   Type:                 git
-  Location:             git://github.com/NixOS/cabal2nix.git
+  Location:             git://github.com/peti/cabal2nix.git
 
 Executable cabal2nix
   main-is:              Cabal2Nix.hs