diff --git a/southbridge/Kconfig b/southbridge/Kconfig
index c7b91b3c93..0bd251de50 100644
--- a/southbridge/Kconfig
+++ b/southbridge/Kconfig
@@ -19,5 +19,6 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
+source southbridge/amd/Kconfig
 source southbridge/intel/Kconfig
 
diff --git a/southbridge/Makefile b/southbridge/Makefile
index 46cfbf1dc3..6c7fdcdcd2 100644
--- a/southbridge/Makefile
+++ b/southbridge/Makefile
@@ -19,5 +19,6 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
+include $(src)/southbridge/amd/Makefile
 include $(src)/southbridge/intel/Makefile
 
diff --git a/southbridge/amd/Kconfig b/southbridge/amd/Kconfig
new file mode 100644
index 0000000000..666ec6bf5f
--- /dev/null
+++ b/southbridge/amd/Kconfig
@@ -0,0 +1,27 @@
+##
+## This file is part of the LinuxBIOS project.
+##
+## Copyright (C) 2007 coresystems GmbH
+## Written by Stefan Reinauer <stepan@coresystems.de> for coresystems GmbH.
+##
+## 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
+##
+
+config SOUTHBRIDGE_AMD_CS5536
+	boolean
+	help
+	  This option is internally used to decide which southbridge code to
+	  use. It is set in the mainboard Kconfig file.
+
diff --git a/southbridge/amd/Makefile b/southbridge/amd/Makefile
new file mode 100644
index 0000000000..223fd89313
--- /dev/null
+++ b/southbridge/amd/Makefile
@@ -0,0 +1,26 @@
+##
+## This file is part of the LinuxBIOS project.
+##
+## Copyright (C) 2007 coresystems GmbH
+## Written by Stefan Reinauer <stepan@coresystems.de> for coresystems GmbH.
+##
+## 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
+##
+
+# One entry like the below for each supported AMD southbridge.
+ifeq ($(CONFIG_SOUTHBRIDGE_AMD_CS5536),y)
+	include $(src)/southbridge/amd/cs5536/Makefile
+endif
+
diff --git a/southbridge/amd/cs5536/Makefile b/southbridge/amd/cs5536/Makefile
new file mode 100644
index 0000000000..572f5b70fb
--- /dev/null
+++ b/southbridge/amd/cs5536/Makefile
@@ -0,0 +1,28 @@
+##
+## This file is part of the LinuxBIOS project.
+##
+## Copyright (C) 2007 coresystems GmbH
+## Written by Stefan Reinauer <stepan@coresystems.de> for coresystems GmbH.
+##
+## 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
+##
+
+STAGE2_CHIPSET_OBJ += $(obj)/southbridge/amd/cs5536/cs5536.o
+
+$(obj)/southbridge/amd/cs5536/%.o: $(src)/southbridge/amd/cs5536/%.c
+	$(Q)mkdir -p $(obj)/southbridge/amd/cs5536/
+	$(Q)printf "  CC      $(subst $(shell pwd)/,,$(@))\n"
+	$(Q)$(CC) $(INITCFLAGS) -c $< -o $@
+