14 files changed, 19 insertions, 7 deletions
diff --git a/build/arch-options/alpha b/build/arch-options/alpha
index e2806ba8b..2997a3531 100644
--- a/build/arch-options/alpha
+++ b/build/arch-options/alpha
@@ -14,6 +14,7 @@ smp_config_option="Symmetric multi-processing support"
 fdisk="fdisk.txt;cfdisk.txt"
 network="supports-tftp;supports-bootp;supports-nfsroot"
 boot=""
+frontend="newt;not-gtk"
 other="supports-serial-console;rescue-needs-root-disk"
 smp="supports-smp"
 goodies=""
diff --git a/build/arch-options/amd64 b/build/arch-options/amd64
index 16adfa124..9af33c4c7 100644
--- a/build/arch-options/amd64
+++ b/build/arch-options/amd64
@@ -14,7 +14,8 @@ smp_config_option="Symmetric multi-processing support"
 fdisk="fdisk.txt;cfdisk.txt"
 network="supports-tftp;supports-bootp;supports-nfsroot"
 boot="bootable-disk;bootable-usb"
-other="supports-wireless;supports-pcmcia;supports-serial-console;rescue-needs-root-disk;g-i"
+frontend="newt;gtk"
+other="supports-wireless;supports-pcmcia;supports-serial-console;rescue-needs-root-disk"
 smp="smp-alternatives"
 goodies="supports-lang-chooser"
 status="checked"
diff --git a/build/arch-options/arm b/build/arch-options/arm
index 3cc122d66..c1aad4753 100644
--- a/build/arch-options/arm
+++ b/build/arch-options/arm
@@ -14,6 +14,7 @@ smp_config_option="N/A"
 fdisk="fdisk.txt;cfdisk.txt"
 network="supports-tftp;supports-rarp;supports-bootp;supports-nfsroot"
 boot=""
+frontend="newt;not-gtk"
 other="supports-serial-console;rescue-needs-root-disk"
 smp=""
 goodies="supports-lang-chooser"
diff --git a/build/arch-options/hppa b/build/arch-options/hppa
index d1adc0a9b..e275b0d65 100644
--- a/build/arch-options/hppa
+++ b/build/arch-options/hppa
@@ -14,6 +14,7 @@ smp_config_option="Symmetric multi-processing support"
 fdisk="cfdisk.txt"
 network="supports-tftp;supports-bootp;supports-nfsroot"
 boot=""
+frontend="newt;not-gtk"
 other="supports-serial-console;rescue-needs-root-disk"
 smp="supports-smp"
 goodies="supports-lang-chooser"
diff --git a/build/arch-options/i386 b/build/arch-options/i386
index a332ac9ff..db3e75a98 100644
--- a/build/arch-options/i386
+++ b/build/arch-options/i386
@@ -14,7 +14,8 @@ smp_config_option="Symmetric multi-processing support"
 fdisk="fdisk.txt;cfdisk.txt"
 network="supports-tftp;supports-bootp;supports-nfsroot"
 boot="supports-floppy-boot;bootable-disk;bootable-usb"
-other="supports-wireless;supports-pcmcia;supports-serial-console;rescue-needs-root-disk;g-i"
+frontend="newt;gtk"
+other="supports-wireless;supports-pcmcia;supports-serial-console;rescue-needs-root-disk"
 smp="smp-alternatives"
 goodies="supports-lang-chooser"
 status="checked"
diff --git a/build/arch-options/ia64 b/build/arch-options/ia64
index 3120099ef..1450634f5 100644
--- a/build/arch-options/ia64
+++ b/build/arch-options/ia64
@@ -14,6 +14,7 @@ smp_config_option="SMP support"
 fdisk="parted.txt;cfdisk.txt"
 network="supports-tftp;supports-bootp;supports-nfsroot"
 boot=""
+frontend="newt;not-gtk"
 other="supports-serial-console;rescue-needs-root-disk"
 smp="supports-smp"
 goodies="supports-lang-chooser"
diff --git a/build/arch-options/m68k b/build/arch-options/m68k
index 8d4b84a5d..ce44e8880 100644
--- a/build/arch-options/m68k
+++ b/build/arch-options/m68k
@@ -14,6 +14,7 @@ smp_config_option="N/A"
 fdisk="atari-fdisk.txt;mac-fdisk.txt;amiga-fdisk.txt;pmac-fdisk.txt"
 network="supports-tftp;supports-rarp;supports-bootp;supports-nfsroot"
 boot="supports-floppy-boot;bootable-disk"
+frontend="newt;not-gtk"
 other="supports-serial-console;rescue-needs-root-disk"
 smp=""
 goodies="supports-lang-chooser"
diff --git a/build/arch-options/mips b/build/arch-options/mips
index 8a0b6730e..d0d31f9d4 100644
--- a/build/arch-options/mips
+++ b/build/arch-options/mips
@@ -14,6 +14,7 @@ smp_config_option="N/A"
 fdisk="fdisk.txt;cfdisk.txt"
 network="supports-tftp;supports-nfsroot"
 boot=""
+frontend="newt;not-gtk"
 other="supports-serial-console;rescue-needs-root-disk"
 smp=""
 goodies=""
diff --git a/build/arch-options/mipsel b/build/arch-options/mipsel
index f41f8b28f..efb408018 100644
--- a/build/arch-options/mipsel
+++ b/build/arch-options/mipsel
@@ -14,6 +14,7 @@ smp_config_option="N/A"
 fdisk="fdisk.txt;cfdisk.txt"
 network="supports-tftp;supports-bootp;supports-nfsroot"
 boot=""
+frontend="newt;not-gtk"
 other="supports-serial-console;rescue-needs-root-disk"
 smp=""
 goodies=""
diff --git a/build/arch-options/powerpc b/build/arch-options/powerpc
index d8a39c239..eff2c2447 100644
--- a/build/arch-options/powerpc
+++ b/build/arch-options/powerpc
@@ -14,7 +14,8 @@ smp_config_option="Symmetric multi-processing support"
 fdisk="mac-fdisk.txt;cfdisk.txt"
 network="supports-tftp;supports-bootp;supports-nfsroot"
 boot="supports-floppy-boot;bootable-disk;bootable-usb"
-other="supports-wireless;supports-pcmcia;supports-serial-console;rescue-needs-root-disk;g-i"
+frontend="newt;gtk"
+other="supports-wireless;supports-pcmcia;supports-serial-console;rescue-needs-root-disk"
 smp="supports-smp"
 goodies="supports-lang-chooser"
 status="not-checked"
diff --git a/build/arch-options/s390 b/build/arch-options/s390
index b88bc3927..e9925bf1b 100644
--- a/build/arch-options/s390
+++ b/build/arch-options/s390
@@ -14,6 +14,7 @@ smp_config_option="Symmetric multi-processing support"
 fdisk="fdasd.txt;dasdfmt.txt"
 network=""
 boot=""
+frontend="not-newt;not-gtk"
 other="rescue-needs-root-disk"
 smp="defaults-smp"
 goodies=""
diff --git a/build/arch-options/sparc b/build/arch-options/sparc
index 563a9955c..eaaa1a8ab 100644
--- a/build/arch-options/sparc
+++ b/build/arch-options/sparc
@@ -14,6 +14,7 @@ smp_config_option="Symmetric multi-processing support"
 fdisk="fdisk.txt"
 network="supports-tftp;supports-rarp;supports-bootp;supports-nfsroot"
 boot="supports-floppy-boot"
+frontend="newt;not-gtk"
 other="supports-serial-console;rescue-needs-root-disk"
 # SMP support is described in hardware/supported/sparc.xml
 #smp="supports-smp-sometimes"
diff --git a/build/buildone.sh b/build/buildone.sh
index 41af537c9..bedb81c4e 100755
--- a/build/buildone.sh
+++ b/build/buildone.sh
@@ -72,7 +72,7 @@ create_profiled () {
     fi
 
     # Join all architecture options into one big variable
-    condition="$fdisk;$network;$boot;$smp;$other;$goodies;$unofficial_build;$status;$manual_release"
+    condition="$fdisk;$network;$boot;$smp;$frontend;$other;$goodies;$unofficial_build;$status;$manual_release"
     # Add language options
     condition="$condition;$optional_paras"
     # Add build options for the manual
diff --git a/en/boot-installer/parameters.xml b/en/boot-installer/parameters.xml
index 1dd93ee8d..8f67c5b75 100644
--- a/en/boot-installer/parameters.xml
+++ b/en/boot-installer/parameters.xml
@@ -237,7 +237,7 @@ parameter <userinput>debian-installer/framebuffer=true</userinput> or
 </para></note></listitem>
 </varlistentry>
 
-<varlistentry>
+<varlistentry arch="not-s390">
 <term>debian-installer/theme</term>
 <listitem><para>
 
@@ -355,7 +355,7 @@ If you are using a 2.2.x kernel, you may need to set &ramdisksize;.
 </para></listitem>
 </varlistentry>
 
-<varlistentry condition="g-i">
+<varlistentry condition="gtk">
 <term>mouse/left</term>
 <listitem><para>
 
@@ -365,7 +365,7 @@ left-handed operation by setting this parameter to <userinput>true</userinput>.
 </para></listitem>
 </varlistentry>
 
-<varlistentry condition="g-i">
+<varlistentry condition="gtk">
 <term>directfb/hw-accel</term>
 <listitem><para>