Index: debian/rules
===================================================================
--- debian/rules	(.../anbe-195-rebase)	(revision 1806)
+++ debian/rules	(.../anbe-196-control-template)	(revision 1806)
@@ -118,6 +118,7 @@
 
 #	    chmod 775 $(CURDIR)/debian/temp/modules/nvidia-kernel/debian/patches
 	    cp $(CURDIR)/$(dirname)/usr/src/nv/* $(CURDIR)/debian/temp/modules/nvidia-kernel/
+	cp -p $(CURDIR)/$(dirname)/usr/share/doc/NVIDIA_Changelog $(CURDIR)/debian/temp/modules/nvidia-kernel/
 
 		# We don't want these makefiles that don't work with kbuild
 		rm $(CURDIR)/debian/temp/modules/nvidia-kernel/makefile
Index: debian/changelog
===================================================================
--- debian/changelog	(.../anbe-195-rebase)	(revision 1806)
+++ debian/changelog	(.../anbe-196-control-template)	(revision 1806)
@@ -6,6 +6,7 @@
 
 nvidia-graphics-drivers (190.53-4) UNRELEASED; urgency=low
 
+  [ Russ Allbery ]
   * Add Conflicts and Replaces for the fix in 190.53-3 to the
     nvidia-*vdpau*-ia32 packages.  (190.53-2 installed files in
     the opposite package as was intended.)  (Closes: #577059)
@@ -28,6 +29,14 @@
   * Add some additional Lintian overrides for nvidia-glx for the weirdness
     we need to partly replace the free libGL libraries.
 
+  [ Andreas Beckmann ]
+  * update debian.binary/control.template using the copy from
+    nvidia-graphics-modules-i386
+  * include a copy of the NVIDIA changelog in the module packages built from
+    nvidia-kernel-source
+  * install the changelog from the nvidia-kernel-source package, too, if
+    building via nvidia-graphics-modules-*
+
  -- Russ Allbery <rra@debian.org>  Fri, 09 Apr 2010 01:11:41 -0700
 
 nvidia-graphics-drivers (190.53-3) unstable; urgency=high
Index: debian.binary/control.template
===================================================================
--- debian.binary/control.template	(.../anbe-195-rebase)	(revision 1806)
+++ debian.binary/control.template	(.../anbe-196-control-template)	(revision 1806)
@@ -1,20 +1,22 @@
 Source: nvidia-kernel
 Section: non-free/kernel
 Priority: optional
-Maintainer: Randall Donald <rdonald@debian.org>
-Build-Depends: debhelper (>> 3.0.0), make, libc6-dev
-Standards-Version: 3.6.0
+Maintainer: Debian NVIDIA Maintainers <pkg-nvidia-devel@lists.alioth.debian.org>
+Uploaders: Randall Donald <rdonald@debian.org>, Russ Allbery <rra@debian.org>
+Build-Depends: debhelper (>= 7)
+Standards-Version: 3.8.4
+Homepage: http://www.nvidia.com/
 
 Package: nvidia-kernel-#KVERS#
 Architecture: i386 amd64
 Provides: nvidia-kernel-#VERSION#
 Depends: nvidia-kernel-common, linux-image-#KVERS#
 Description: NVIDIA binary kernel module for Linux #KVERS#
- These Xorg binary drivers provide optimized hardware acceleration of 
- OpenGL applications via a direct-rendering X Server. 
+ This package provides the non-free NVIDIA binary kernel module built for
+ the Debian Linux kernel package.  This kernel module is required by the
+ nvidia-glx X video driver, the non-free binary video driver for NVIDIA
+ graphics chipsets.  This is the main NVIDIA driver release, which
+ supports the latest chipsets; for older chipsets, see the NVIDIA legacy
+ packages.
  .
- This package contains the NVIDIA binary kernel module needed by
- nvidia-glx.
- .
- For more information on this source package visit NVIDIA's homepage
- at http://www.nvidia.com/ .
+ This package is built for linux-image-#KVERS#.
Index: debian.binary/rules
===================================================================
--- debian.binary/rules	(.../anbe-195-rebase)	(revision 1806)
+++ debian.binary/rules	(.../anbe-196-control-template)	(revision 1806)
@@ -45,10 +45,9 @@
 	dh_installdirs
 	install -m 0644 $(CURDIR)/nvidia.ko $(CURDIR)/debian/nvidia-kernel-$(KVERS)/lib/modules/$(KVERS)/nvidia/nvidia.ko ; \
 
-	dh_installdocs
+	dh_installdocs $(wildcard debian/changelog.nvidia-kernel-source*)
+	dh_installchangelogs NVIDIA_Changelog
 	dh_installmodules
-	dh_installchangelogs
-	dh_installmodules
 	dh_strip
 	dh_compress
 	dh_fixperms