diff --git a/README.md b/README.md
index 51248a2..f6d2314 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # argparse
 
-[![Build Status](https://travis-ci.org/mpeterv/argparse.png?branch=master)](https://travis-ci.org/mpeterv/argparse)
-[![Coverage status](https://codecov.io/gh/mpeterv/argparse/branch/master/graph/badge.svg)](https://codecov.io/gh/mpeterv/argparse)
+[![Build Status](https://travis-ci.org/luarocks/argparse.png?branch=master)](https://travis-ci.org/luarocks/argparse)
+[![Coverage status](https://codecov.io/gh/luarocks/argparse/branch/master/graph/badge.svg)](https://codecov.io/gh/luarocks/argparse)
 
 Argparse is a feature-rich command line parser for Lua inspired by argparse for Python.
 
diff --git a/argparse-scm-1.rockspec b/argparse-scm-2.rockspec
similarity index 77%
rename from argparse-scm-1.rockspec
rename to argparse-scm-2.rockspec
index c44adaa..aa098e8 100644
--- a/argparse-scm-1.rockspec
+++ b/argparse-scm-2.rockspec
@@ -1,12 +1,12 @@
 package = "argparse"
-version = "scm-1"
+version = "scm-2"
 source = {
-   url = "git+https://github.com/mpeterv/argparse.git"
+   url = "git+https://github.com/luarocks/argparse.git"
 }
 description = {
    summary = "A feature-rich command-line argument parser",
    detailed = "Argparse supports positional arguments, options, flags, optional arguments, subcommands and more. Argparse automatically generates usage, help and error messages.",
-   homepage = "https://github.com/mpeterv/argparse",
+   homepage = "https://github.com/luarocks/argparse",
    license = "MIT"
 }
 dependencies = {
diff --git a/docsrc/index.rst b/docsrc/index.rst
index e4d0de1..1d4b5bc 100644
--- a/docsrc/index.rst
+++ b/docsrc/index.rst
@@ -16,4 +16,4 @@ Contents:
    completions
    misc
 
-This is a tutorial for `argparse <https://github.com/mpeterv/argparse>`_, a feature-rich command line parser for Lua.
+This is a tutorial for `argparse <https://github.com/luarocks/argparse>`_, a feature-rich command line parser for Lua.