diff --git a/debian/copyright b/debian/copyright
index b73e8c4..24a2495 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,43 +1,35 @@
-This work was packaged for Debian by:
-
-    David Caldwell <david@porkrind.org> on Sat, 20 Mar 2010 15:42:43 -0700
-
-It was downloaded from:
-
-    <http://porkrind.org/commit-patch/>
-
-Upstream Authors:
-
-       o   David Caldwell <david@porkrind.org>
-       o   Jim Radford <radford@blackbean.org>
-
-Copyright:
-
-       Copyright 2003-2010 by David Caldwell and Jim Radford.
-
-License:
-
-    This package 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 2 of the License, or
-    (at your option) any later version.
-
-    This package 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 this program. If not, see <http://www.gnu.org/licenses/>
-
-On Debian systems, the complete text of the GNU General
-Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
-
-The Debian packaging is:
-
-    Copyright (C) 2010,2011 David Caldwell <david@porkrind.org>
-
-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 2 of the License, or
-(at your option) any later version.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: commit-patch
+Upstream-Contact: David Caldwell <david@porkrind.org>
+                  Jim Radford <radford@blackbean.org>
+Source: http://porkrind.org/commit-patch/
+
+Files: *
+Copyright: 2003-2013 by David Caldwell and Jim Radford.
+License: GPL-2+
+
+Files: debian/*
+Copyright: 2010,2011,2013 David Caldwell <david@porkrind.org>
+License: GPL-2+
+
+License: GPL-2+
+ This program 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 2 of the License, or (at your option) any later
+ version.
+ .
+ This program 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 this package; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA  02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.