diff --git a/configure.ac b/configure.ac
index 1bcf0dd72..9c6d526f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -206,6 +206,16 @@ AC_ARG_ENABLE(fastscan,
 	AC_DEFINE(ENABLE_FASTSCAN, 1, [enable fastscan code]))
 AM_CONDITIONAL(ENABLE_FASTSCAN, test "$enable_fastscan" = "yes")
 
+AC_ARG_ENABLE(aitscan,
+	AS_HELP_STRING([--enable-aitscan], [enable Application Information Table support @<:@default=yes@:>@]),
+	[enable_aitscan="$enableval"],
+	[enable_aitscan="yes"])
+
+if test "$enable_aitscan" = "yes"; then
+	AC_DEFINE(ENABLE_AIT, 1, [enable Application Information Table support])
+fi
+AM_CONDITIONAL(ENABLE_AIT, test "$enable_aitscan" = "yes")
+
 AC_ARG_ENABLE(giflib,
 	AS_HELP_STRING([--enable-giflib], [use giflib instead of libungif @<:@default=no@:>@]),
 	AC_DEFINE(ENABLE_GIFLIB, 1, [use giflib instead of libungif]))
diff --git a/src/zapit/include/zapit/channel.h b/src/zapit/include/zapit/channel.h
index ceb07c38f..1f6b1503d 100644
--- a/src/zapit/include/zapit/channel.h
+++ b/src/zapit/include/zapit/channel.h
@@ -142,7 +142,7 @@ class CZapitChannel
 
 		unsigned short			pcrPid;
 		unsigned short			pmtPid;
-#if ENABLE_HBBTV
+#if ENABLE_AIT
 		unsigned short			aitPid;
 #endif
 		unsigned short			teletextPid;
@@ -246,7 +246,7 @@ class CZapitChannel
 		unsigned char 		getAudioChannelCount(void)	{ return (unsigned char) audioChannels.size(); }
 		unsigned short		getPcrPid(void)			{ return pcrPid; }
 		unsigned short		getPmtPid(void)			{ return pmtPid; }
-#if ENABLE_HBBTV
+#if ENABLE_AIT
 		unsigned short		getAitPid(void)			{ return aitPid; }
 #endif
 		unsigned short		getTeletextPid(void)		{ return teletextPid; }
@@ -272,7 +272,7 @@ class CZapitChannel
 		void setAudioChannel(unsigned char pAudioChannel)	{ if (pAudioChannel < audioChannels.size()) currentAudioChannel = pAudioChannel; }
 		void setPcrPid(unsigned short pPcrPid)			{ pcrPid = pPcrPid; }
 		void setPmtPid(unsigned short pPmtPid)			{ pmtPid = pPmtPid; }
-#if ENABLE_HBBTV
+#if ENABLE_AIT
 		void setAitPid(unsigned short pAitPid)			{ aitPid = pAitPid; }
 #endif
 		void setTeletextPid(unsigned short pTeletextPid)	{ teletextPid = pTeletextPid; }
diff --git a/src/zapit/include/zapit/zapit.h b/src/zapit/include/zapit/zapit.h
index 276f18215..0068fdc9b 100644
--- a/src/zapit/include/zapit/zapit.h
+++ b/src/zapit/include/zapit/zapit.h
@@ -19,7 +19,7 @@
 #include <zapit/bouquets.h>
 #include <zapit/femanager.h>
 #include <zapit/fastscan.h>
-#if ENABLE_HBBTV
+#if ENABLE_AIT
 #include <zapit/scanait.h>
 #endif
 
@@ -170,7 +170,7 @@ class CZapit : public OpenThreads::Thread
 		t_channel_id  lastChannelTV;
 		int abort_zapit;
 		int pmt_update_fd;
-#if ENABLE_HBBTV
+#if ENABLE_AIT
 		CAit *ait;
 #endif
 		//void LoadAudioMap();
diff --git a/src/zapit/src/Makefile.am b/src/zapit/src/Makefile.am
index 6395e51c2..e395d78df 100644
--- a/src/zapit/src/Makefile.am
+++ b/src/zapit/src/Makefile.am
@@ -38,7 +38,7 @@ libzapit_a_SOURCES += \
 	fastscan.cpp
 endif
 
-if ENABLE_HBBTV
+if ENABLE_AIT
 libzapit_a_SOURCES += \
 	scanait.cpp
 endif
diff --git a/src/zapit/src/channel.cpp b/src/zapit/src/channel.cpp
index ca2b8fea4..986ab030d 100644
--- a/src/zapit/src/channel.cpp
+++ b/src/zapit/src/channel.cpp
@@ -114,7 +114,7 @@ void CZapitChannel::Init()
 	bUseCI = false;
 	altlogo = "";
 	epgmapper = "";
-#if ENABLE_HBBTV
+#if ENABLE_AIT
 	aitPid = 0;
 #endif
 }
diff --git a/src/zapit/src/scanpmt.cpp b/src/zapit/src/scanpmt.cpp
index ec167e308..dbf8e1eba 100644
--- a/src/zapit/src/scanpmt.cpp
+++ b/src/zapit/src/scanpmt.cpp
@@ -38,7 +38,7 @@
 #include <dvbsi++/teletext_descriptor.h>
 #include <dvbsi++/subtitling_descriptor.h>
 #include <dvbsi++/vbi_teletext_descriptor.h>
-#if ENABLE_HBBTV
+#if ENABLE_AIT
 #include <dvbsi++/application_information_section.h>
 #include <dvbsi++/application_name_descriptor.h>
 #include <dvbsi++/application_profile.h>
@@ -337,7 +337,7 @@ bool CPmt::ParseEsInfo(ElementaryStreamInfo *esinfo, CZapitChannel * const chann
 		audio_type = CZapitAudioChannel::EAC3;
 		audio = true;
 		break;
-#if ENABLE_HBBTV
+#if ENABLE_AIT
 	case STREAM_TYPE_PRIVATE_SECTION:
 		for (DescriptorConstIterator desc = esinfo->getDescriptors()->begin(); desc != esinfo->getDescriptors()->end(); ++desc)
 		{
diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp
index 6e270d9c7..cafd599c9 100644
--- a/src/zapit/src/zapit.cpp
+++ b/src/zapit/src/zapit.cpp
@@ -141,7 +141,7 @@ CZapit::CZapit()
 	pip_channel_id = 0;
 	lock_channel_id = 0;
 	pip_fe = NULL;
-#if ENABLE_HBBTV
+#if ENABLE_AIT
 	ait = new CAit();
 #endif
 }
@@ -666,7 +666,7 @@ bool CZapit::ZapIt(const t_channel_id channel_id, bool forupdate, bool startplay
 	if (update_pmt)
 		pmt_set_update_filter(current_channel, &pmt_update_fd);
 
-#if ENABLE_HBBTV
+#if ENABLE_AIT
 	ait->setDemux(current_channel->getRecordDemux());
 	ait->Parse(current_channel);
 #endif