diff --git a/lib/hardware/coolstream/Makefile.am b/lib/hardware/coolstream/Makefile.am
index 82f3ab83c..b2a96b31e 100644
--- a/lib/hardware/coolstream/Makefile.am
+++ b/lib/hardware/coolstream/Makefile.am
@@ -1,13 +1,6 @@
 AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing
 
 AM_CPPFLAGS = \
-	-I$(top_builddir) \
-	-I$(top_srcdir) \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/zapit/include \
-	-I$(top_srcdir)/lib \
-	-I$(top_srcdir)/lib/libconfigfile \
-	-I$(top_srcdir)/lib/libeventserver \
 	@HWLIB_CFLAGS@
 
 noinst_LIBRARIES = libhwcaps.a
diff --git a/lib/hardware/coolstream/hardware_caps.cpp b/lib/hardware/coolstream/hardware_caps.cpp
index 139825c32..0922eb655 100644
--- a/lib/hardware/coolstream/hardware_caps.cpp
+++ b/lib/hardware/coolstream/hardware_caps.cpp
@@ -11,8 +11,6 @@
 #include <string.h>
 #include "hardware_caps.h"
 
-#include <zapit/femanager.h>
-
 static int initialized = 0;
 static hw_caps_t caps;
 
@@ -21,7 +19,7 @@ hw_caps_t *get_hwcaps(void) {
 		return &caps;
 	int rev = cs_get_revision();
 	int chip = cs_get_chip_type();
-	caps.has_fan = (rev < 8 && CFEManager::getInstance()->getFE(0)->hasSat()); // only SAT-HD1 before rev 8 has fan
+	caps.has_fan = (rev < 8); // see dirty part of hw_caps in neutrino.cpp
 	caps.has_HDMI = 1;
 	caps.has_SCART = (rev != 10);
 	caps.has_SCART_input = 0;
@@ -44,14 +42,7 @@ hw_caps_t *get_hwcaps(void) {
 		caps.force_tuner_2G = 1;
 		break;
 	case 8:
-		if (CFEManager::getInstance()->getFrontendCount() < 2)
-		{
-			strcpy(caps.boxname, "Neo");
-		}
-		else
-		{
-			strcpy(caps.boxname, "Neo Twin");
-		}
+		strcpy(caps.boxname, "Neo"); // see dirty part of hw_caps in neutrino.cpp
 		strcpy(caps.boxarch, "Nevis");
 		caps.force_tuner_2G = 1;
 		break;
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 99c17645d..080a31d07 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -2239,6 +2239,20 @@ TIMER_START();
 
 	CheckFastScan();
 
+	// dirty part of hw_caps - specify some details after zapit start
+	if (strcmp(g_info.hw_caps->boxname, "HD1") == 0)
+	{
+		// only SAT-HD1 has fan
+		if (!CFEManager::getInstance()->getFE(0)->hasSat())
+			g_info.hw_caps->has_fan = 0;
+	}
+	if (strcmp(g_info.hw_caps->boxname, "Neo") == 0)
+	{
+		// detecting Neo Twin by counting frontends
+		if (CFEManager::getInstance()->getFrontendCount() > 1)
+			strcpy(g_info.hw_caps->boxname, "Neo Twin");
+	}
+
 	//timer start
 	timer_wakeup = false;//init
 	wake_up( timer_wakeup );