diff --git a/debian/changelog b/debian/changelog
index cab9f91f..086289be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-shadow (1:4.1.5-1) unstable; urgency=low
+shadow (1:4.1.5-1) UNRELEASED; urgency=low
 
+  [ Nicolas FRANCOIS (Nekral) ]
   * The "Charolais" release.
   * New upstream release:
     - userdel: Check the existence of the user's mail spool before trying to
@@ -57,6 +58,10 @@ shadow (1:4.1.5-1) unstable; urgency=low
     (http://lists.debian.org/debian-release/2011/02/msg00320.html)
   * debian/securetty.linux: Fixed typo: ttyama -> ttyAMA. Closes: #544184
 
+  [ Christian Perrier ]
+  * Use "linux-any" instead of a negated list of architectures in
+    Build-Depends
+
  -- Nicolas FRANCOIS (Nekral) <nicolas.francois@centraliens.net>  Fri, 24 Jun 2011 23:43:56 +0200
 
 shadow (1:4.1.4.2+svn3283-3) unstable; urgency=high
diff --git a/debian/control b/debian/control
index 25b32580..966261c1 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: required
 Maintainer: Shadow package maintainers <pkg-shadow-devel@lists.alioth.debian.org>
 Standards-Version: 3.8.4
 Uploaders: Christian Perrier <bubulle@debian.org>, Nicolas FRANCOIS (Nekral) <nicolas.francois@centraliens.net>
-Build-Depends: autoconf, automake1.9, libtool, gettext, libpam0g-dev, debhelper (>= 6.0.7~), quilt, dpkg-dev (>= 1.13.5), xsltproc, docbook-xsl, docbook-xml, libxml2-utils, cdbs, libselinux1-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], gnome-doc-utils (>= 0.4.3)
+Build-Depends: autoconf, automake1.9, libtool, gettext, libpam0g-dev, debhelper (>= 6.0.7~), quilt, dpkg-dev (>= 1.13.5), xsltproc, docbook-xsl, docbook-xml, libxml2-utils, cdbs, libselinux1-dev [linux-any], gnome-doc-utils (>= 0.4.3)
 Vcs-Svn: svn://svn.debian.org/svn/pkg-shadow/debian/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-shadow/debian/trunk
 Homepage: http://pkg-shadow.alioth.debian.org/