diff --git a/mainboard/artecgroup/dbe61/dts b/mainboard/artecgroup/dbe61/dts
index b443533313..48df2881da 100644
--- a/mainboard/artecgroup/dbe61/dts
+++ b/mainboard/artecgroup/dbe61/dts
@@ -109,6 +109,9 @@ end
 			/* USB Port Power Handling setting. */
 			pph = "0xf5";
 		};
+		pci@f,1 {
+			/config/("southbridge/amd/cs5536/nand");
+		};
 		pci@f,2 {
 			/config/("southbridge/amd/cs5536/ide");
 		};
diff --git a/mainboard/artecgroup/dbe62/dts b/mainboard/artecgroup/dbe62/dts
index 213c39799b..3cbe0ff1a7 100644
--- a/mainboard/artecgroup/dbe62/dts
+++ b/mainboard/artecgroup/dbe62/dts
@@ -63,6 +63,9 @@
 			/* USB Port Power Handling setting. */
 			pph = "0xf5";
 		};
+		pci@f,1 {
+			/config/("southbridge/amd/cs5536/nand");
+		};
 		pci@f,2 {
 			/config/("southbridge/amd/cs5536/ide");
 		};
diff --git a/southbridge/amd/cs5536/cs5536.c b/southbridge/amd/cs5536/cs5536.c
index 89d64d6ae1..057400f1f3 100644
--- a/southbridge/amd/cs5536/cs5536.c
+++ b/southbridge/amd/cs5536/cs5536.c
@@ -97,6 +97,23 @@ static void hide_vpci(u32 vpci_devid)
 	outl(0xDEADBEEF, 0xCFC);
 }
 
+/**
+ * Enables the FLASH PCI header when NAND device existing in mainboard device
+ * tree. Used when the mainboard has a FLASH part instead of an IDE drive and
+ * that fact is expressed in the mainboard device tree.
+ * Must be called after VSA init but before PCI scans to enable the flash
+ * PCI device header early enough - that is .phase2_fixup of the device.
+ *
+ * @param dev The device.
+ */
+static void nand_phase2(struct device *dev)
+{
+	if (dev->enabled) {
+		/* Tell VSA to use FLASH PCI header. Not IDE header. */
+		hide_vpci(0x800079C4);
+	}
+}
+
 /**
  * Power button setup.
  *
@@ -170,16 +187,6 @@ static void chipset_flash_setup(struct southbridge_amd_cs5536_dts_config *sb)
 	printk(BIOS_DEBUG, "chipset_flash_setup: Finish\n");
 }
 
-/**
- * Use this in the event that you have a FLASH part instead of an IDE drive.
- * Run after VSA init to enable the flash PCI device header.
- */
-static void enable_ide_nand_flash_header(void)
-{
-	/* Tell VSA to use FLASH PCI header. Not IDE header. */
-	hide_vpci(0x800079C4);
-}
-
 #define RTC_CENTURY	0x32
 #define RTC_DOMA	0x3D
 #define RTC_MONA	0x3E
@@ -601,8 +608,8 @@ void chipsetinit(void)
 #define IDE_ETC	  0x50
 
 /**
- * Enabled the IDE. This is code that is optionally run if the ide_enable is set
- * in the mainboard dts. 
+ * Enables the IDE. This is code that is run if there is an ide device in the mainboard
+ * device tree and it has set non-zero "enable_ide".
  * 
  * @param dev The device 
  */
@@ -658,11 +665,6 @@ static void southbridge_init(struct device *dev)
 		printk(BIOS_SPEW, "cs5536: done second call vr_write\n");
 	}
 
-	printk(BIOS_ERR, "cs5536: %s: enable_ide_nand_flash is %d\n",
-	       __FUNCTION__, sb->enable_ide_nand_flash);
-	if (sb->enable_ide_nand_flash != 0)
-		enable_ide_nand_flash_header();
-
 	enable_USB_port4(sb);
 
 	/* disable unwanted virtual PCI devices */
@@ -733,3 +735,16 @@ struct device_operations cs5536_ide = {
 	.ops_pci		 = &pci_dev_ops_pci,
 };
 
+struct device_operations cs5536_nand = {
+	.id = {.type = DEVICE_ID_PCI,
+		{.pci = {.vendor = PCI_VENDOR_ID_AMD,
+			 .device = PCI_DEVICE_ID_AMD_CS5536_FLASH}}},
+	.constructor		 = default_device_constructor,
+	.phase2_fixup		 = nand_phase2,
+	.phase3_scan		 = 0,
+	.phase4_read_resources	 = pci_dev_read_resources,
+	.phase4_set_resources	 = pci_set_resources,
+	.phase5_enable_resources = pci_dev_enable_resources,
+	.phase6_init		 = 0, /* No Option ROMs */
+	.ops_pci		 = &pci_dev_ops_pci,
+};
diff --git a/southbridge/amd/cs5536/nand b/southbridge/amd/cs5536/nand
new file mode 100644
index 0000000000..69f4fa48f5
--- /dev/null
+++ b/southbridge/amd/cs5536/nand
@@ -0,0 +1,23 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2009 Mart Raudsepp <mart.raudsepp@artecdesign.ee>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+{
+	device_operations = "cs5536_nand";
+};