diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000..17a6f3e
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1,21 @@
+The primary authors are:
+
+    Joel Schaerer
+    William Ting
+
+Here is an inevitably incomplete list of much appreciated contributors -- people
+who have submitted patches, reported bugs, maintained packages, and in general
+made autojump that much better (in no particular order):
+
+    Tanguy Ortolo
+    Thibault North
+    Olivier Mehani
+    Fabien Bourgeois
+    Binh Nguyen
+    Neeraj Verma
+    Evan Shelhamer
+    xiannaitong
+    Pierre Gueth
+    Tom Parker
+    Liyang Chang
+    Jez Ng
diff --git a/LICENSE b/LICENSE
index 94a0453..cb5b2e1 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,3 +1,17 @@
+autojump is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+autojump is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+full GNU General Public License below for more details.
+
+autojump is a small tool that maintains a database of your most
+used directories, and finds the best match to help you jump to
+frequently used places.
+
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
diff --git a/bin/_j b/bin/_j
index e5e25ae..55eb7f2 100644
--- a/bin/_j
+++ b/bin/_j
@@ -1,23 +1,6 @@
 #compdef j
-
-#Copyright Joel Schaerer 2008, 2009
-#This file is part of autojump
-
-#autojump is free software: you can redistribute it and/or modify
-#it under the terms of the GNU General Public License as published by
-#the Free Software Foundation, either version 3 of the License, or
-#(at your option) any later version.
-#
-#autojump is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU General Public License
-#along with autojump.  If not, see <http://www.gnu.org/licenses/>.
-
 cur=${words[2, -1]}
 
-autojump --completion ${=cur[*]} | while read i; do 
-    compadd -U "$i"; 
+autojump --completion ${=cur[*]} | while read i; do
+    compadd -U "$i";
 done
diff --git a/bin/autojump b/bin/autojump
index 66db2a0..5152a0f 100755
--- a/bin/autojump
+++ b/bin/autojump
@@ -1,24 +1,4 @@
 #!/usr/bin/env python
-"""Copyright Joel Schaerer 2008-2012
-This file is part of autojump
-
-autojump is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-autojump is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with autojump.  If not, see <http://www.gnu.org/licenses/>.
-
-Autojump is a small tool that maintains a database of your most
-used directories, and finds the best match to help you jump to
-frequently used places."""
-
 from __future__ import division, print_function
 
 import argparse
diff --git a/bin/autojump.bash b/bin/autojump.bash
index 1f2ad5d..bc0831f 100644
--- a/bin/autojump.bash
+++ b/bin/autojump.bash
@@ -1,20 +1,3 @@
-#Copyright Joel Schaerer 2008, 2009
-#This file is part of autojump
-
-#autojump is free software: you can redistribute it and/or modify
-#it under the terms of the GNU General Public License as published by
-#the Free Software Foundation, either version 3 of the License, or
-#(at your option) any later version.
-#
-#autojump is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU General Public License
-#along with autojump.  If not, see <http://www.gnu.org/licenses/>.
-
-#This shell snippet sets the prompt command and the necessary aliases
 _autojump()
 {
         local cur
diff --git a/bin/autojump.sh b/bin/autojump.sh
index 6f56b68..55ba5c4 100644
--- a/bin/autojump.sh
+++ b/bin/autojump.sh
@@ -1,19 +1,4 @@
 # Source autojump on BASH or ZSH depending on the shell
-#Copyright Joel Schaerer 2008, 2009
-#This file is part of autojump
-
-#autojump is free software: you can redistribute it and/or modify
-#it under the terms of the GNU General Public License as published by
-#the Free Software Foundation, either version 3 of the License, or
-#(at your option) any later version.
-#
-#autojump is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU General Public License
-#along with autojump.  If not, see <http://www.gnu.org/licenses/>.
 if [ "$BASH_VERSION" ] && [ -n "$PS1" ] && echo $SHELLOPTS | grep -v posix >>/dev/null; then
     if [ -f ~/.autojump/etc/profile.d/autojump.bash ]; then
         source ~/.autojump/etc/profile.d/autojump.bash
diff --git a/bin/autojump.zsh b/bin/autojump.zsh
index bd38e25..7f15953 100644
--- a/bin/autojump.zsh
+++ b/bin/autojump.zsh
@@ -1,19 +1,3 @@
-#Copyright Joel Schaerer 2008, 2009
-#This file is part of autojump
-
-#autojump is free software: you can redistribute it and/or modify
-#it under the terms of the GNU General Public License as published by
-#the Free Software Foundation, either version 3 of the License, or
-#(at your option) any later version.
-#
-#autojump is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU General Public License
-#along with autojump.  If not, see <http://www.gnu.org/licenses/>.
-
 # determine the data directory according to the XDG Base Directory Specification
 if [[ -n ${XDG_DATA_HOME} ]] && [[ ${XDG_DATA_HOME} =~ ${USER} ]]; then
     export AUTOJUMP_DATA_DIR="${XDG_DATA_HOME}/autojump"
diff --git a/bin/jumpapplet b/bin/jumpapplet
index 7290b17..1e35399 100755
--- a/bin/jumpapplet
+++ b/bin/jumpapplet
@@ -1,21 +1,4 @@
 #!/usr/bin/env python2
-
-#Copyright Joel Schaerer and Pierre Gueth 2008, 2009
-#This file is part of autojump
-
-#autojump is free software: you can redistribute it and/or modify
-#it under the terms of the GNU General Public License as published by
-#the Free Software Foundation, either version 3 of the License, or
-#(at your option) any later version.
-#
-#autojump is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU General Public License
-#along with autojump.  If not, see <http://www.gnu.org/licenses/>.
-
 import subprocess
 import cPickle
 import os.path
@@ -127,7 +110,7 @@ def popup(sender,button,activation):
     else:
         def collapse_home(path):
             return path
-    
+
     menu=gtk.Menu()
     if defaults["invert"]:
         item=gtk.ImageMenuItem(stock_id=gtk.STOCK_QUIT)
@@ -138,7 +121,7 @@ def popup(sender,button,activation):
         menu.append(item)
 
         menu.append(gtk.SeparatorMenuItem())
-        
+
         for path in reversed(paths):
             actions=get_actions(path)
             if not actions: continue
@@ -166,7 +149,7 @@ def popup(sender,button,activation):
             menu.append(item)
 
         menu.append(gtk.SeparatorMenuItem())
-        
+
         item=gtk.ImageMenuItem(stock_id=gtk.STOCK_PREFERENCES)
         item.connect("activate",settings)
         menu.append(item)
diff --git a/install.sh b/install.sh
index 67a3fcc..eb76a46 100755
--- a/install.sh
+++ b/install.sh
@@ -1,19 +1,4 @@
 #!/usr/bin/env bash
-#Copyright Joel Schaerer 2008-2012
-#This file is part of autojump
-
-#autojump is free software: you can redistribute it and/or modify
-#it under the terms of the GNU General Public License as published by
-#the Free Software Foundation, either version 3 of the License, or
-#(at your option) any later version.
-#
-#autojump is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU General Public License
-#along with autojump.  If not, see <http://www.gnu.org/licenses/>.
 
 function add_msg {
     echo
diff --git a/uninstall.sh b/uninstall.sh
index 72f6cee..d88eefc 100755
--- a/uninstall.sh
+++ b/uninstall.sh
@@ -1,19 +1,4 @@
 #!/usr/bin/env bash
-#Copyright Joel Schaerer 2008-2012
-#This file is part of autojump
-
-#autojump is free software: you can redistribute it and/or modify
-#it under the terms of the GNU General Public License as published by
-#the Free Software Foundation, either version 3 of the License, or
-#(at your option) any later version.
-#
-#autojump is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU General Public License
-#along with autojump.  If not, see <http://www.gnu.org/licenses/>.
 
 function help_msg {
     echo "sudo ./uninstall.sh [--prefix /usr/local]"