5 files changed, 13 insertions, 21 deletions
diff --git a/contrib/fpm2pass.pl b/contrib/fpm2pass.pl
index 09aeb5a..d1a0908 100755
--- a/contrib/fpm2pass.pl
+++ b/contrib/fpm2pass.pl
@@ -1,5 +1,8 @@
 #!/usr/bin/perl
 
+# Copyright (C) 2012 Jeffrey Ratcliffe <jeffrey.ratcliffe@gmail.com>. All Rights Reserved.
+# This file is licensed under the GPLv2+. Please see COPYING for more information.
+
 use warnings;
 use strict;
 use XML::Simple;
diff --git a/contrib/keepassx2pass.py b/contrib/keepassx2pass.py
index cc75938..538c157 100755
--- a/contrib/keepassx2pass.py
+++ b/contrib/keepassx2pass.py
@@ -1,9 +1,8 @@
 #! /usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# (C) Copyright 2012 Juhamatti Niemelä <iiska@iki.fi>. All Rights
-# Reserved. This file is licensed under the GPLv2+. Please see COPYING
-# for more information.
+# Copyright (C) 2012 Juhamatti Niemelä <iiska@iki.fi>. All Rights Reserved.
+# This file is licensed under the GPLv2+. Please see COPYING for more information.
 
 import sys
 
diff --git a/contrib/pass.bash-completion b/contrib/pass.bash-completion
index 22d3229..ccffbfa 100644
--- a/contrib/pass.bash-completion
+++ b/contrib/pass.bash-completion
@@ -1,8 +1,8 @@
 # completion file for bash
 
-# (C) Copyright 2012 Jason A. Donenfeld <Jason@zx2c4.com> and
+# Copyright (C) 2012 Jason A. Donenfeld <Jason@zx2c4.com> and
 # Brian Mattern <rephorm@rephorm.com>. All Rights Reserved.
-# This is released under the GPLv2+. Please see COPYING for more information.
+# This file is licensed under the GPLv2+. Please see COPYING for more information.
 
 _pass_complete_entries () {
 	prefix="${PASSWORD_STORE_DIR:-$HOME/.password-store/}"
diff --git a/contrib/pass.fish-completion b/contrib/pass.fish-completion
index a0bbabd..7652d56 100644
--- a/contrib/pass.fish-completion
+++ b/contrib/pass.fish-completion
@@ -1,13 +1,7 @@
 #!/usr/bin/env fish
-#
-# Fish shell completions for pass.
-#
-# Copyright © 2012 Jason A. Donenfeld <Jason@zx2c4.com>
-# Pass is GNU GPL v2 licensed.
-# This completion script is, as pass itself, GNU GPL v2 licensed.
-# See COPYING file distributed with pass for more details.
-#
-# Contributed by Dmitry Medvinsky <dmedvinsky@gmail.com>
+
+# Copyright (C) 2012 Dmitry Medvinsky <dmedvinsky@gmail.com>. All Rights Reserved.
+# This file is licensed under the GPLv2+. Please see COPYING for more information.
 
 set PROG 'pass'
 
diff --git a/contrib/pass.zsh-completion b/contrib/pass.zsh-completion
index ef52976..bcb2f98 100644
--- a/contrib/pass.zsh-completion
+++ b/contrib/pass.zsh-completion
@@ -1,12 +1,8 @@
 #compdef pass
 
-# This file is under the GPLv2+ license.
-# Heavily based on http://zsh.sf.net/Guide/zshguide06.html#l177
-# And Frédéric Perrin article http://tar-jx.bz/notes/zsh-completion.html
-# Originally by Johan Venant, September 2012
-# Modified substantially by Brian Mattern, September 2012
-
-
+# Copyright (C) 2012 Johan Venant <jvenant@invicem.pro> and
+# Brian Mattern <rephorm@rephorm.com>. All Rights Reserved.
+# This file is licensed under the GPLv2+. Please see COPYING for more information.
 
 _pass () {
 	local cmd