diff --git a/debian/arch/alpha/config b/debian/arch/alpha/config
index cc8bc9fb6..4eece1763 100644
--- a/debian/arch/alpha/config
+++ b/debian/arch/alpha/config
@@ -1161,7 +1161,6 @@ CONFIG_FB_ATY128=m
 CONFIG_FB_ATY=m
 CONFIG_FB_ATY_CT=y
 # CONFIG_FB_ATY_GENERIC_LCD is not set
-CONFIG_FB_ATY_XL_INIT=y
 CONFIG_FB_ATY_GX=y
 CONFIG_FB_SAVAGE=m
 # CONFIG_FB_SAVAGE_I2C is not set
diff --git a/debian/arch/amd64/config b/debian/arch/amd64/config
index 84c64fb69..a16c64ad8 100644
--- a/debian/arch/amd64/config
+++ b/debian/arch/amd64/config
@@ -1105,7 +1105,6 @@ CONFIG_FB_ATY128=m
 CONFIG_FB_ATY=m
 CONFIG_FB_ATY_CT=y
 # CONFIG_FB_ATY_GENERIC_LCD is not set
-CONFIG_FB_ATY_XL_INIT=y
 CONFIG_FB_ATY_GX=y
 CONFIG_FB_SAVAGE=m
 # CONFIG_FB_SAVAGE_I2C is not set
diff --git a/debian/arch/arm/config.footbridge b/debian/arch/arm/config.footbridge
index 637cd788c..14fac6655 100644
--- a/debian/arch/arm/config.footbridge
+++ b/debian/arch/arm/config.footbridge
@@ -1722,7 +1722,6 @@ CONFIG_FONT_8x16=y
 # CONFIG_FB_3DFX_ACCEL is not set
 CONFIG_FB_ATY_GX=y
 # CONFIG_FB_ATY_GENERIC_LCD is not set
-# CONFIG_FB_ATY_XL_INIT is not set
 CONFIG_FB_VOODOO1=m
 # CONFIG_MTD_BLOCK2MTD is not set
 # CONFIG_MTD_MTDRAM is not set
diff --git a/debian/arch/i386/config b/debian/arch/i386/config
index 8dd23ac9f..9abcdd1a9 100644
--- a/debian/arch/i386/config
+++ b/debian/arch/i386/config
@@ -1310,7 +1310,6 @@ CONFIG_FB_ATY128=m
 CONFIG_FB_ATY=m
 CONFIG_FB_ATY_CT=y
 CONFIG_FB_ATY_GENERIC_LCD=y
-CONFIG_FB_ATY_XL_INIT=y
 CONFIG_FB_ATY_GX=y
 CONFIG_FB_SAVAGE=m
 CONFIG_FB_SAVAGE_I2C=y
diff --git a/debian/arch/ia64/config b/debian/arch/ia64/config
index 6e92d2d5b..5b4dd4a5f 100644
--- a/debian/arch/ia64/config
+++ b/debian/arch/ia64/config
@@ -912,7 +912,6 @@ CONFIG_FB_ATY128=m
 CONFIG_FB_ATY=m
 CONFIG_FB_ATY_CT=y
 CONFIG_FB_ATY_GENERIC_LCD=y
-# CONFIG_FB_ATY_XL_INIT is not set
 CONFIG_FB_ATY_GX=y
 CONFIG_FB_SAVAGE=m
 CONFIG_FB_SAVAGE_I2C=y
diff --git a/debian/arch/m68k/config.amiga b/debian/arch/m68k/config.amiga
index f1244862f..a68c9530d 100644
--- a/debian/arch/m68k/config.amiga
+++ b/debian/arch/m68k/config.amiga
@@ -153,7 +153,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_MODE_HELPERS is not set
 # CONFIG_FB_TILEBLITTING is not set
-CONFIG_FB_CIRRUS=m
+CONFIG_FB_CIRRUS=y
 # CONFIG_FB_PM2 is not set
 CONFIG_FB_AMIGA=y
 CONFIG_FB_AMIGA_OCS=y
diff --git a/debian/arch/powerpc/config b/debian/arch/powerpc/config
index fff80f8d0..8031b667e 100644
--- a/debian/arch/powerpc/config
+++ b/debian/arch/powerpc/config
@@ -892,7 +892,6 @@ CONFIG_FB_ATY128=y
 CONFIG_FB_ATY=y
 CONFIG_FB_ATY_CT=y
 CONFIG_FB_ATY_GENERIC_LCD=y
-# CONFIG_FB_ATY_XL_INIT is not set
 CONFIG_FB_ATY_GX=y
 CONFIG_FB_SAVAGE=m
 CONFIG_FB_SAVAGE_I2C=y
diff --git a/debian/arch/sparc/config.sparc64 b/debian/arch/sparc/config.sparc64
index 3dbe2c234..c30c0d121 100644
--- a/debian/arch/sparc/config.sparc64
+++ b/debian/arch/sparc/config.sparc64
@@ -37,7 +37,6 @@ CONFIG_FB_ATY128=y
 CONFIG_FB_ATY=y
 CONFIG_FB_ATY_CT=y
 # CONFIG_FB_ATY_GENERIC_LCD is not set
-# CONFIG_FB_ATY_XL_INIT is not set
 CONFIG_FB_ATY_GX=y
 CONFIG_FB_FFB=y
 # CONFIG_FB_TCX is not set
diff --git a/debian/arch/sparc/config.sparc64-smp b/debian/arch/sparc/config.sparc64-smp
index 07f893868..115146831 100644
--- a/debian/arch/sparc/config.sparc64-smp
+++ b/debian/arch/sparc/config.sparc64-smp
@@ -41,7 +41,6 @@ CONFIG_FB_ATY128=y
 CONFIG_FB_ATY=y
 CONFIG_FB_ATY_CT=y
 # CONFIG_FB_ATY_GENERIC_LCD is not set
-# CONFIG_FB_ATY_XL_INIT is not set
 CONFIG_FB_ATY_GX=y
 CONFIG_FB_FFB=y
 # CONFIG_FB_TCX is not set
diff --git a/debian/changelog b/debian/changelog
index eac247c63..ff4e423b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,7 +36,7 @@ linux-2.6 (2.6.15+2.6.16-rc4-0experimental.1) UNRELEASED; urgency=low
 
  -- Bastian Blank <waldi@debian.org>  Mon, 20 Feb 2006 16:55:53 +0000
 
-linux-2.6 (2.6.15-7) UNRELEASED; urgency=low
+linux-2.6 (2.6.15-7) unstable; urgency=low
 
   [ Norbert Tretkowski ]
   * [alpha] Disabled CONFIG_ALPHA_LEGACY_START_ADDRESS for -alpha-generic and
@@ -47,7 +47,22 @@ linux-2.6 (2.6.15-7) UNRELEASED; urgency=low
   * [i386] Renamed kernel-image-2.6-486 to kernel-image-2.6-386, it's meant for
     transition only, and kernel-image-2.6-386 is the package name in sarge.
 
- -- Norbert Tretkowski <nobse@debian.org>  Sun, 12 Feb 2006 11:55:30 +0100
+  [ Jurij Smakov ]
+  * Bump build-dependency on kernel-package to 10.035, which is fixed
+    to build the documentation packages again.
+    Closes: #352000, #348332
+
+  [ Frederik Schüler ]
+  * Activate CONFIG_DVB_AV7110_OSD on alpha amd64 and ia64.
+    Closes: #353292
+  * Deactivate CONFIG_FB_ATY_XL_INIT on all architectures: it is broken and
+    already removed in 2.6.16-rc.
+    Closes: #353310
+
+  [ Christian T. Steigies ]
+  * [m68k] build in cirrusfb driver
+
+ -- Bastian Blank <waldi@debian.org>  Tue, 21 Feb 2006 17:35:21 +0000
 
 linux-2.6 (2.6.15-6) unstable; urgency=low