diff --git a/debian/changelog b/debian/changelog
index 4c05adb..48380c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+postfwd (1.10pre7c-3) UNRELEASED; urgency=low
+
+  * implement machine-interpretable copyright file
+
+ -- Jan Wagner <waja@cyconet.org>  Tue, 15 Jul 2008 22:58:06 +0200
+
 postfwd (1.10pre7c-2) unstable; urgency=low
 
   * Uploading to unstable.
diff --git a/debian/copyright b/debian/copyright
index e239d41..7878293 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,14 +1,23 @@
-This package was debianized by Jan Wagner <waja@cyconet.org> on
-Mon, 10 Mar 2008 22:37:44 +0100
-
-It was downloaded from <http://www.postfwd.org/>
-
-Upstream Author: Jan Peter Kessler <info@postfwd.org>
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
+Packaged-By: Jan Wagner <waja@cyconet.org>
+Packaged-Date: Mon, 10 Mar 2008 22:37:44 +0100
+Upstream-Name: postfwd
+Upstream-Maintainer: Jan Peter Kessler <info@postfwd.org>
+Upstream-Source: http://www.postfwd.org
 
+Files: *
 Copyright: (c) 2007, Jan Peter Kessler, All rights reserved.
+License: BSD-3
 
-License:
+Files: debian/*
+Copyright: (C) 2006, 2008 Jan Wagner <waja@cyconet.org>
+License: GPL-2+
 
+Files: debian/example-cfg2.txt
+Copyright: (c) 2008, Henrik Krohns <hege@hege.li>
+License: BSD-3
+
+License: BSD-3
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are met:
 
@@ -32,9 +41,20 @@ License:
     OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
     ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-Different copyrights/licenses:
+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.
 
-    debian/example-cfg2.txt: (c) 2008, Henrik Krohns <hege@hege.li>
+        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.
 
-The Debian packaging is (C) 2008 Jan Wagner <waja@cyconet.org> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+ On Debian systems, the complete text of the GNU General Public License can be
+ found in /usr/share/common-licenses/GPL-2 file.