diff --git a/debian/changelog b/debian/changelog
index 2754c5a..c6c4c52 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 ubuntu-dev-tools (0.76) UNRELEASED; urgency=low
 
+  [ Nicolas Valcárcel ]
+  * mk-sbuild-lv:
+    - Add check for built-in dm_snapshot (LP: #398414)
+
   [ Andreas Moog ]
   * update-maintainer:
     - Don't silently fail when Maintainer-Field contains a comment
@@ -7,7 +11,7 @@ ubuntu-dev-tools (0.76) UNRELEASED; urgency=low
     - Don't add second XSBC-Original-Maintainer if Maintainer was set
       to Motu or Core-Dev.
 
- -- Andreas Moog <amoog@ubuntu.com>  Wed, 08 Jul 2009 23:07:05 +0200
+ -- Nicolas Valcárcel Scerpella (Canonical) <nvalcarcel@canonical.com>  Mon, 20 Jul 2009 15:07:53 -0500
 
 ubuntu-dev-tools (0.75) karmic; urgency=low
 
diff --git a/mk-sbuild-lv b/mk-sbuild-lv
index fe9c44d..33cca9e 100755
--- a/mk-sbuild-lv
+++ b/mk-sbuild-lv
@@ -40,9 +40,13 @@ fi
 if [ ! -w /var/lib/sbuild ]; then
     # Load all the packages you'll need to do work
     sudo apt-get install sbuild schroot debootstrap lvm2
-    # Make sure LVM tools that operate on the snapshots have needed module
-    sudo modprobe dm_snapshot
-    sudo bash -c "grep ^dm_snapshot /etc/modules >/dev/null || echo dm_snapshot >> /etc/modules"
+    # Make sure dm_snapshot is not built-in into the kernel
+    sudo bash -c "dmsetup targets | grep ^snapshot > /dev/null || BUILTIN=False"
+    if [ "$BUILTIN" = "False" ]; then
+        # Make sure LVM tools that operate on the snapshots have needed module
+        sudo modprobe dm_snapshot
+        sudo bash -c "grep ^dm_snapshot /etc/modules >/dev/null || echo dm_snapshot >> /etc/modules"
+    fi
     # Add self to the sbuild group
     sudo adduser "$USER" sbuild