diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale
index 8480c40f3..b4397fb57 100644
--- a/data/locale/deutsch.locale
+++ b/data/locale/deutsch.locale
@@ -597,8 +597,7 @@ extra.tp_mod_8 8PSK
 extra.tp_mod_8a 8APSK
 extra.tp_mod_auto AUTO
 extra.tp_pilot Pilot
-extra.tp_pilot_auto Auto (HW)
-extra.tp_pilot_auto_sw Auto (SW)
+extra.tp_pilot_auto Auto
 extra.tp_plc PLM Code
 extra.tp_pli Stream ID
 extra.tp_plm PLS Modus
diff --git a/data/locale/english.locale b/data/locale/english.locale
index 9576130b0..011d4f6a6 100644
--- a/data/locale/english.locale
+++ b/data/locale/english.locale
@@ -597,8 +597,7 @@ extra.tp_mod_8 8PSK
 extra.tp_mod_8a 8APSK
 extra.tp_mod_auto AUTO
 extra.tp_pilot Pilot
-extra.tp_pilot_auto Auto (HW)
-extra.tp_pilot_auto_sw Auto (SW)
+extra.tp_pilot_auto Auto
 extra.tp_plc PLM Code
 extra.tp_pli Stream ID
 extra.tp_plm PLS Mode
diff --git a/src/gui/scan_setup.cpp b/src/gui/scan_setup.cpp
index 14e40366f..31e10a789 100644
--- a/src/gui/scan_setup.cpp
+++ b/src/gui/scan_setup.cpp
@@ -323,13 +323,12 @@ const CMenuOptionChooser::keyval SATSETUP_SCANTP_POL[SATSETUP_SCANTP_POL_COUNT]
 	{ 3, LOCALE_EXTRA_TP_POL_R }
 };
 
-#define SATSETUP_SCANTP_PILOT_COUNT 4
+#define SATSETUP_SCANTP_PILOT_COUNT 3
 const CMenuOptionChooser::keyval SATSETUP_SCANTP_PILOT[SATSETUP_SCANTP_PILOT_COUNT] =
 {
 	{ ZPILOT_ON,      LOCALE_OPTIONS_ON },
 	{ ZPILOT_OFF,     LOCALE_OPTIONS_OFF },
-	{ ZPILOT_AUTO,    LOCALE_EXTRA_TP_PILOT_AUTO },
-	{ ZPILOT_AUTO_SW, LOCALE_EXTRA_TP_PILOT_AUTO_SW }
+	{ ZPILOT_AUTO,    LOCALE_EXTRA_TP_PILOT_AUTO }
 };
 
 #define OPTIONS_SOUTH0_NORTH1_OPTION_COUNT 2
diff --git a/src/system/locals.h b/src/system/locals.h
index 7c9832e24..7bbfca836 100644
--- a/src/system/locals.h
+++ b/src/system/locals.h
@@ -625,7 +625,6 @@ typedef enum
 	LOCALE_EXTRA_TP_MOD_AUTO,
 	LOCALE_EXTRA_TP_PILOT,
 	LOCALE_EXTRA_TP_PILOT_AUTO,
-	LOCALE_EXTRA_TP_PILOT_AUTO_SW,
 	LOCALE_EXTRA_TP_PLC,
 	LOCALE_EXTRA_TP_PLI,
 	LOCALE_EXTRA_TP_PLM,
diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h
index 90516612e..85f556968 100644
--- a/src/system/locals_intern.h
+++ b/src/system/locals_intern.h
@@ -625,7 +625,6 @@ const char * locale_real_names[] =
 	"extra.tp_mod_auto",
 	"extra.tp_pilot",
 	"extra.tp_pilot_auto",
-	"extra.tp_pilot_auto_sw",
 	"extra.tp_plc",
 	"extra.tp_pli",
 	"extra.tp_plm",
diff --git a/src/zapit/include/zapit/frontend_types.h b/src/zapit/include/zapit/frontend_types.h
index 37acb4f45..39e684f91 100644
--- a/src/zapit/include/zapit/frontend_types.h
+++ b/src/zapit/include/zapit/frontend_types.h
@@ -105,8 +105,7 @@ typedef enum {
 typedef enum {
 	ZPILOT_ON,
 	ZPILOT_OFF,
-	ZPILOT_AUTO,
-	ZPILOT_AUTO_SW
+	ZPILOT_AUTO
 } zapit_pilot_t;
 
 typedef enum {
diff --git a/src/zapit/src/frontend.cpp b/src/zapit/src/frontend.cpp
index 85f67a2a4..9a38b18ef 100644
--- a/src/zapit/src/frontend.cpp
+++ b/src/zapit/src/frontend.cpp
@@ -1568,10 +1568,8 @@ bool CFrontend::buildProperties(const FrontendParameters *feparams, struct dtv_p
 			pilot = PILOT_OFF;
 			break;
 		case ZPILOT_AUTO:
-			pilot = PILOT_AUTO;
-			break;
-		case ZPILOT_AUTO_SW:
 		default:
+			pilot = PILOT_AUTO;
 			break;
 	}