diff --git a/src/gui/scan.cpp b/src/gui/scan.cpp
index 70e57c21d..37add87e1 100644
--- a/src/gui/scan.cpp
+++ b/src/gui/scan.cpp
@@ -76,7 +76,7 @@ CScanTs::CScanTs()
 }
 
 extern int scan_fta_flag;//in zapit descriptors definiert
-extern int start_fast_scan(int scan_mode, int opid);
+//extern int start_fast_scan(int scan_mode, int opid);
 #include <zapit/getservices.h>
 
 void CScanTs::prev_next_TP( bool up)
@@ -269,7 +269,7 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey)
 	} else if(manual)
 		success = g_Zapit->scan_TP(TP);
 	else if(fast) {
-		success = CZapit::getInstance()->StartFastScan(scansettings.fast_type, scansettings.fast_op);
+//		success = CZapit::getInstance()->StartFastScan(scansettings.fast_type, scansettings.fast_op);
 	}
 	else
 		success = g_Zapit->startScan(scan_mode);
diff --git a/src/gui/scan_setup.cpp b/src/gui/scan_setup.cpp
index 3294c070b..17598f276 100644
--- a/src/gui/scan_setup.cpp
+++ b/src/gui/scan_setup.cpp
@@ -53,7 +53,9 @@
 #include <zapit/frontend_c.h>
 #include <zapit/getservices.h>
 #include <zapit/satconfig.h>
+#ifdef ENABLE_FASTSCAN
 #include <zapit/fastscan.h>
+#endif
 #include <zapit/zapit.h>
 
 extern std::map<transponder_id_t, transponder> select_transponders;
diff --git a/src/gui/scan_setup.h b/src/gui/scan_setup.h
index e4a47b62d..5ba65743b 100644
--- a/src/gui/scan_setup.h
+++ b/src/gui/scan_setup.h
@@ -41,7 +41,7 @@
 
 #define scansettings CNeutrinoApp::getInstance()->getScanSettings()
 
-#define ENABLE_FASTSCAN //don't define this to remove fast scan menu
+//#define ENABLE_FASTSCAN //don't define this to remove fast scan menu
 
 class CScanSetup : public CMenuTarget
 {
diff --git a/src/zapit/include/zapit/scan.h b/src/zapit/include/zapit/scan.h
index 0320a36f4..3b63e5456 100644
--- a/src/zapit/include/zapit/scan.h
+++ b/src/zapit/include/zapit/scan.h
@@ -13,7 +13,7 @@
 
 #include <zapit/frontend_c.h>
 #include <zapit/getservices.h>
-#include <zapit/fastscan.h>
+//#include <zapit/fastscan.h>
 #include "bouquets.h"
 #include <OpenThreads/Thread>
 
@@ -25,7 +25,7 @@ class CServiceScan : public OpenThreads::Thread
 		typedef enum scan_type {
 			SCAN_PROVIDER,
 			SCAN_TRANSPONDER,
-			SCAN_FAST
+//			SCAN_FAST
 		} scan_type_t;
 
 	private:
@@ -62,7 +62,7 @@ class CServiceScan : public OpenThreads::Thread
 
 		bool ScanTransponder();
 		bool ScanProviders();
-
+#if 0
 		/* fast scan */
 		std::map <t_channel_id, t_satellite_position> fast_services_sat;
 		std::map <t_channel_id, freq_id_t> fast_services_freq;
@@ -75,7 +75,7 @@ class CServiceScan : public OpenThreads::Thread
 		void process_service_list_descriptor(const unsigned char * const buffer, const t_transport_stream_id transport_stream_id, const t_original_network_id original_network_id, t_satellite_position satellitePosition, freq_id_t freq);
 		void process_satellite_delivery_system_descriptor(const unsigned char * const buffer, FrontendParameters * feparams, uint8_t * polarization, t_satellite_position * satellitePosition);
 		bool ScanFast();
-
+#endif
 		void run();
 
 		static CServiceScan * scan;
diff --git a/src/zapit/include/zapit/zapit.h b/src/zapit/include/zapit/zapit.h
index 44a23a37a..7c0c54faa 100644
--- a/src/zapit/include/zapit/zapit.h
+++ b/src/zapit/include/zapit/zapit.h
@@ -143,7 +143,7 @@ class CZapit : public OpenThreads::Thread
 		bool PrepareChannels();
 		bool StartScan(int scan_mode);
 		bool StartScanTP(TP_params * TPparams);
-		bool StartFastScan(int scan_mode, int opid);
+//		bool StartFastScan(int scan_mode, int opid);
 
 		void addChannelToBouquet(const unsigned int bouquet, const t_channel_id channel_id);
 		void SetConfig(Zapit_config * Cfg);
diff --git a/src/zapit/src/Makefile.am b/src/zapit/src/Makefile.am
index 94f11c0e9..ff8d16629 100644
--- a/src/zapit/src/Makefile.am
+++ b/src/zapit/src/Makefile.am
@@ -21,7 +21,8 @@ noinst_LIBRARIES = libzapit.a
 libzapit_a_SOURCES = \
 	bouquets.cpp channel.cpp dvbstring.cpp getservices.cpp \
 	scan.cpp zapit.cpp cam.cpp ci.cpp frontend.cpp \
-	descriptors.cpp nit.cpp pat.cpp pmt.cpp sdt.cpp fastscan.cpp
+	descriptors.cpp nit.cpp pat.cpp pmt.cpp sdt.cpp
+#	fastscan.cpp
 
 bin_PROGRAMS = pzapit
 sbin_PROGRAMS = udpstreampes
diff --git a/src/zapit/src/scan.cpp b/src/zapit/src/scan.cpp
index bfa348a6d..d085792ae 100644
--- a/src/zapit/src/scan.cpp
+++ b/src/zapit/src/scan.cpp
@@ -118,9 +118,11 @@ void CServiceScan::run()
 		case SCAN_TRANSPONDER:
 			ScanTransponder();
 			break;
+#if 0
 		case SCAN_FAST:
 			ScanFast();
 			break;
+#endif
 		default:
 			break;
 	}
diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp
index 2fc658f2f..077815293 100644
--- a/src/zapit/src/zapit.cpp
+++ b/src/zapit/src/zapit.cpp
@@ -43,7 +43,7 @@
 #include <zapit/pat.h>
 #include <zapit/pmt.h>
 #include <zapit/scan.h>
-#include <zapit/fastscan.h>
+//#include <zapit/fastscan.h>
 #include <zapit/settings.h>
 #include <zapit/zapit.h>
 #include <xmlinterface.h>
@@ -709,6 +709,7 @@ bool CZapit::StartScanTP(TP_params * TPparams)
 	return true;
 }
 
+#if 0
 bool CZapit::StartFastScan(int scan_mode, int opid)
 {
 	fast_scan_type_t scant;
@@ -721,6 +722,7 @@ bool CZapit::StartFastScan(int scan_mode, int opid)
 	CServiceScan::getInstance()->Start(CServiceScan::SCAN_FAST, (void *) &scant);
 	return true;
 }
+#endif
 
 bool CZapit::ParseCommand(CBasicMessage::Header &rmsg, int connfd)
 {