diff --git a/debian/changelog b/debian/changelog
index 5da843086..7883624c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,7 @@ linux (4.18~rc7-1~exp1) UNRELEASED; urgency=medium
   * scripts/kernel-doc: Escape all literal braces in regexes (Closes: #905116)
   * debian/bin/genorig.py: Add support for debian/copyright Files-Excluded
     field
+  * Move file exclusion from d/p/debian/dfsg/files-1 to d/copyright
 
  -- Uwe Kleine-König <ukleinek@debian.org>  Sat, 21 Jul 2018 16:52:01 +0200
 
diff --git a/debian/copyright b/debian/copyright
index db5328dd6..90f0c4ec7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,13 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Linux kernel
 Source: https://www.kernel.org/pub/linux/kernel/
+Files-Excluded: Documentation/netlabel/draft-ietf-cipso-ipsecurity-01.txt
+ arch/powerpc/sysdev/micropatch.c
+ drivers/media/usb/dvb-usb/af9005-script.h
+ drivers/media/i2c/vs6624.c
+ drivers/net/appletalk/cops*.[ch]
+ drivers/video/fbdev/nvidia
+ drivers/video/fbdev/riva
 Comment:
  The 'perf' tool is dynamically linked with the Python interpreter,
  which is itself dynamically linked with OpenSSL, which is not
diff --git a/debian/patches/debian/dfsg/files-1 b/debian/patches/debian/dfsg/files-1
deleted file mode 100644
index e1c0edfc9..000000000
--- a/debian/patches/debian/dfsg/files-1
+++ /dev/null
@@ -1,16 +0,0 @@
-rm Documentation/netlabel/draft-ietf-cipso-ipsecurity-01.txt
-
-rm arch/powerpc/sysdev/micropatch.c
-
-rm drivers/media/usb/dvb-usb/af9005-script.h
-
-rm drivers/media/i2c/vs6624.c
-
-rm drivers/net/appletalk/cops.c
-rm drivers/net/appletalk/cops.h
-rm drivers/net/appletalk/cops_ffdrv.h
-rm drivers/net/appletalk/cops_ltdrv.h
-
-# These include apparently obfuscated code
-rm drivers/video/fbdev/nvidia/
-rm drivers/video/fbdev/riva/
diff --git a/debian/patches/series-orig b/debian/patches/series-orig
index 7a4e0e9ff..9cff85aa7 100644
--- a/debian/patches/series-orig
+++ b/debian/patches/series-orig
@@ -3,4 +3,3 @@
 + debian/dfsg/vs6624-disable.patch
 + debian/dfsg/drivers-net-appletalk-cops.patch
 + debian/dfsg/video-remove-nvidiafb-and-rivafb.patch
-X debian/dfsg/files-1