--- make.conf
+++ make.conf.s390
@@ -22,6 +22,13 @@
 # Example:
 #USE="X gtk gnome -alsa"
 
+# Host Setting
+# ============
+#
+# All s390 systems should use this host setting:
+
+CHOST="s390-ibm-linux-gnu"
+
 # Host and optimization settings 
 # ==============================
 #
@@ -75,7 +82,7 @@
 # DO NOT PUT ANYTHING BUT YOUR SPECIFIC ~ARCHITECTURE IN THE LIST.
 # IF YOU ARE UNSURE OF YOUR ARCH, OR THE IMPLICATIONS, DO NOT MODIFY THIS.
 #
-#ACCEPT_KEYWORDS="~arch"
+#ACCEPT_KEYWORDS="~s390"
 
 # Portage Directories
 # ===================