diff -u openafs-1.4.10+dfsg1/debian/changelog openafs-1.4.10+dfsg1/debian/changelog
--- openafs-1.4.10+dfsg1/debian/changelog
+++ openafs-1.4.10+dfsg1/debian/changelog
@@ -1,3 +1,13 @@
+openafs (1.4.10+dfsg1-1+ubuntu1) karmic; urgency=low
+
+  * Merge from Debian unstable (LP: #370458), remaining changes:
+    - Reenable DKMS support, which was commented out of 1.4.8.dfsg1-1.
+  * Make openafs-modules-dkms depend on dkms.  (LP: #368471)
+  * Parse $(VERSION) and $(DEBVERS) from debian/changelog.
+    (LP: #364426)
+
+ -- Anders Kaseorg <andersk@mit.edu>  Wed, 29 Apr 2009 02:31:47 -0400
+
 openafs (1.4.10+dfsg1-1) unstable; urgency=high
 
   * New upstream release.
@@ -28,6 +38,31 @@
 
  -- Russ Allbery <rra@debian.org>  Mon, 06 Apr 2009 15:49:34 -0700
 
+openafs (1.4.9.dfsg1-0+ubuntu3) jaunty; urgency=low
+
+  * Fix the version number in the path to the DKMS tree.  (LP: #288743)
+
+ -- Anders Kaseorg <andersk@mit.edu>  Mon, 20 Apr 2009 16:43:46 -0400
+
+openafs (1.4.9.dfsg1-0+ubuntu2) jaunty; urgency=low
+
+  [ Anders Kaseorg ]
+  * Reenable DKMS support, which was commented out of 1.4.8.dfsg1-1.
+    (LP: #288743)
+
+ -- Mario Limonciello <mario_limonciello@dell.com>  Mon, 20 Apr 2009 10:19:38 -0500
+
+openafs (1.4.9.dfsg1-0+ubuntu1) jaunty; urgency=low
+
+  * New upstream release.
+    - OPENAFS-SA-2009-001: Avoid a potential kernel memory overrun if more
+      items than requested are returned from an InlineBulk or BulkStatus
+      message.  (CVE-2009-1251)  (LP: #356861)
+    - OPENAFS-SA-2009-002: Avoid converting negative errors into invalid
+      kernel memory pointers.  (CVE-2009-1250)  (LP: #356861)
+
+ -- Anders Kaseorg <andersk@mit.edu>  Tue, 07 Apr 2009 16:41:24 -0400
+
 openafs (1.4.8.dfsg1-3) unstable; urgency=low
 
   * Apply upstream CVS deltas:
diff -u openafs-1.4.10+dfsg1/debian/control openafs-1.4.10+dfsg1/debian/control
--- openafs-1.4.10+dfsg1/debian/control
+++ openafs-1.4.10+dfsg1/debian/control
@@ -1,7 +1,8 @@
 Source: openafs
 Section: net
 Priority: optional
-Maintainer: Russ Allbery <rra@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Russ Allbery <rra@debian.org>
 Uploaders: Sam Hartman <hartmans@debian.org>
 Build-Depends: debhelper (>= 7), autoconf, automake, bison, comerr-dev,
  flex, libkrb5-dev, libncurses5-dev, libpam0g-dev, perl
@@ -125,17 +126,17 @@
  This package provides the source to the AFS kernel module in a form
  suitable for use by module-assistant or kernel-package.
 
-#Package: openafs-modules-dkms
-#Priority: extra
-#Depends: ${misc:Depends}, bison, flex
-#Architecture: alpha amd64 arm armel i386 ia64 lpia powerpc ppc64 s390 s390x sparc
-#Description: AFS distributed filesystem kernel module DKMS source
-# AFS is a distributed filesystem allowing cross-platform sharing of
-# files among multiple computers.  Facilities are provided for access
-# control, authentication, backup and administrative management.
-# .
-# This package contains the source for the AFS kernel module, packaged with
-# approriate configuration for DKMS to build new modules dynamically.
+Package: openafs-modules-dkms
+Priority: extra
+Depends: ${misc:Depends}, dkms, bison, flex
+Architecture: alpha amd64 arm armel i386 ia64 lpia powerpc ppc64 s390 s390x sparc
+Description: AFS distributed filesystem kernel module DKMS source
+ AFS is a distributed filesystem allowing cross-platform sharing of
+ files among multiple computers.  Facilities are provided for access
+ control, authentication, backup and administrative management.
+ .
+ This package contains the source for the AFS kernel module, packaged with
+ approriate configuration for DKMS to build new modules dynamically.
 
 Package: libpam-openafs-kaserver
 Architecture: alpha amd64 arm armel i386 ia64 lpia powerpc ppc64 s390 s390x sparc
diff -u openafs-1.4.10+dfsg1/debian/rules openafs-1.4.10+dfsg1/debian/rules
--- openafs-1.4.10+dfsg1/debian/rules
+++ openafs-1.4.10+dfsg1/debian/rules
@@ -52,8 +52,8 @@
 
 # These variable is used only by get-orig-source, which will normally only be
 # run by maintainers.
-VERSION   = 1.4.10
-DEBVERS   = 1.4.10+dfsg1
+DEBVERS   := $(shell dpkg-parsechangelog | sed -n 's/^Version: \(.*\)-[^-]*$$/\1/p')
+VERSION   := $(shell echo '$(DEBVERS)' | sed -e 's/[+-].*//' -e 's/\.dfsg.*//' -e 's/~//g')
 UPSTREAM  = /afs/grand.central.org/software/openafs/$(VERSION)
 
 # Download the upstream source, merge in the doc tarball, and do the