diff --git a/.gitignore b/.gitignore
index 2498a7e..b19eae1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,9 +6,12 @@
 .deps
 .dirstamp
 autom4te.cache
+config.guess
 config.h
 config.log
 config.status
+config.sub
+configure
 demo/demo.js
 demo/keyboard.png
 demo/vt100.js
diff --git a/debian/README.source b/debian/README.source
index 52ab12f..4351a73 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,3 +1,3 @@
-The upstream source for shellinabox is archived in googlecode GIT
-repository, <http://code.google.com/p/shellinabox/>.  The package is
-being maintained as a native Debian package.
+The upstream source for shellinabox is archived in GitHub GIT
+repository, <https://github.com/shellinabox/shellinabox/>.
+The package is being maintained as a native Debian package.
diff --git a/debian/changelog b/debian/changelog
index 0df0703..fd00935 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+shellinabox (2.15-1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Bump std version to 3.9.6, no change needed
+  * Bump debhelper compat to 9
+  * move lintian exception in d/shellinabox.lintian
+  * change urls to new GitHub repos
+
+ -- Alexandre Detiste <alexandre.detiste@gmail.com>  Tue, 12 May 2015 14:06:55 +0200
+
 shellinabox (2.14-1) unstable; urgency=low
 
   * Revised install target of debian/rules.
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 081e01f..064b29a 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,12 @@ Source: shellinabox
 Section: web
 Priority: optional
 Maintainer: Marc Singer <elf@debian.org>
-Build-Depends: debhelper (>= 8.0.0), autotools-dev, binutils,
+Build-Depends: debhelper (>= 9), autotools-dev, binutils,
  libssl-dev, libpam0g-dev, zlib1g-dev
-Standards-Version: 3.9.3
+Standards-Version: 3.9.6
 Homepage: http://shellinabox.com
-Vcs-Git: https://code.google.com/p/shellinabox/
-Vcs-Browser: https://code.google.com/p/shellinabox/source/browse/
+Vcs-Git: https://github.com/shellinabox/shellinabox/
+Vcs-Browser: https://github.com/shellinabox/shellinabox/
 
 Package: shellinabox
 Architecture: any
diff --git a/debian/copyright b/debian/copyright
index b1ca30f..96db1b3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,13 @@
-Format: http://dep.debian.net/deps/dep5
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: shellinabox
-Source: <https://code.google.com/p/shellinabox/>
+Source: <https://github.com/shellinabox/shellinabox/>
 
 Files: *
 Copyright: Copyright 2008-2012, Markus Gutschke  All rights reserved.
+                     2012, Marc Singer
+                     2015, Luka Krajger, Philip Hughes, Daniel Gröber,
+                           Ezra Buehler, Anders Kaseorg,
+                           Jonathan Rennison, Guillaume Martres
 Upstream-Author: markus@shellinabox.com
 License: GPL-2+
   This program is free software; you can redistribute it and/or modify
diff --git a/debian/rules b/debian/rules
index c9b5776..e6a9eb0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,12 +53,5 @@ override_dh_install:
 	   "$(DESTDIR)/etc/shellinabox/options-enabled/README"
 # Shellinabox home directory
 #	mkdir -p "$(DESTDIR)/var/lib/shellinabox"
-# Add Lintian override. ShellInABox has an explicit exemption allowing
-# the linking its GPLv2 code with OpenSSL.
-	mkdir -p "$(DESTDIR)/usr/share/lintian/overrides/"
-	{ echo '# ShellInABox has an explicit exemption allowing the linking';\
-	echo '# of its GPLv2 code with OpenSSL';                              \
-	echo 'shellinabox binary: possible-gpl-code-linked-with-openssl'; }   \
-	   >"$(DESTDIR)/usr/share/lintian/overrides/shellinabox"
 # Now perform the normal debhelper install.
 	dh_install
diff --git a/debian/shellinabox.install b/debian/shellinabox.install
index a85965c..673dad3 100644
--- a/debian/shellinabox.install
+++ b/debian/shellinabox.install
@@ -1,5 +1,4 @@
 etc/shellinabox/options-available
 etc/shellinabox/options-enabled
 usr/bin
-usr/share/lintian/overrides
 usr/share/man/man1
diff --git a/debian/shellinabox.lintian-overrides b/debian/shellinabox.lintian-overrides
new file mode 100644
index 0000000..9e1e935
--- /dev/null
+++ b/debian/shellinabox.lintian-overrides
@@ -0,0 +1,3 @@
+# ShellInABox has an explicit exemption allowing the linking
+# of its GPLv2 code with OpenSSL
+shellinabox binary: possible-gpl-code-linked-with-openssl
diff --git a/debian/watch b/debian/watch
index cb7fa73..d7d49e5 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-https://code.google.com/p/shellinabox/downloads/detail?name=shellinabox-(.+).tar.gz
+https://github.com/shellinabox/shellinabox/tags .*/v?(\d\S*)\.tar\.gz
diff --git a/shellinabox/shellinaboxd.man.in b/shellinabox/shellinaboxd.man.in
index b0fca5e..0e401a6 100644
--- a/shellinabox/shellinaboxd.man.in
+++ b/shellinabox/shellinaboxd.man.in
@@ -511,7 +511,7 @@ choice can be removed from the context menu. The user can still make this
 choice by directly going to the appropriate URL.
 .TP
 \fB-q\fP\ |\ \fB--quiet\fP
-Surpresses all messages to
+Suppresses all messages to
 .IR stderr .
 This option is mutually exclusive with
 .B --debug