diff --git a/lib/libdvbsub/Makefile.am b/lib/libdvbsub/Makefile.am
index 2158f8db9..ae9ce161c 100644
--- a/lib/libdvbsub/Makefile.am
+++ b/lib/libdvbsub/Makefile.am
@@ -5,8 +5,12 @@ INCLUDES = \
 	-I$(top_srcdir)/src/zapit/include
 
 if BOXTYPE_COOL
+if BOXMODEL_APOLLO
+INCLUDES += -I$(top_srcdir)/lib/libcoolstream2
+else
 INCLUDES += -I$(top_srcdir)/lib/libcoolstream
 endif
+endif
 if BOXTYPE_TRIPLE
 INCLUDES += -I$(top_srcdir)/lib/libtriple
 endif
diff --git a/lib/libtuxtxt/Makefile.am b/lib/libtuxtxt/Makefile.am
index 827282d3f..8c3a80248 100644
--- a/lib/libtuxtxt/Makefile.am
+++ b/lib/libtuxtxt/Makefile.am
@@ -6,8 +6,13 @@ INCLUDES = \
 	$(FREETYPE_CFLAGS)
 
 if BOXTYPE_COOL
+if BOXMODEL_APOLLO
+INCLUDES += -I$(top_srcdir)/lib/libcoolstream2
+else
 INCLUDES += -I$(top_srcdir)/lib/libcoolstream
 endif
+endif
+
 if BOXTYPE_TRIPLE
 INCLUDES += -I$(top_srcdir)/lib/libtriple
 endif
diff --git a/src/Makefile.am b/src/Makefile.am
index 500996bad..2111f4ad4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,8 +19,12 @@ INCLUDES = \
 	@LIBCS_CFLAGS@
 
 if BOXTYPE_COOL
+if BOXMODEL_APOLLO
+INCLUDES += -I$(top_srcdir)/lib/libcoolstream2
+else
 INCLUDES += -I$(top_srcdir)/lib/libcoolstream
 endif
+endif
 if BOXTYPE_TRIPLE
 SUBDIRS += lcddisplay
 INCLUDES += -I$(top_srcdir)/lib/libtriple
@@ -105,8 +109,12 @@ neutrino_LDADD += \
 endif
 
 if BOXTYPE_COOL
-neutrino_LDADD += \
-	-lcoolstream-mt
+neutrino_LDADD += -lcoolstream-mt
+if ENABLE_TMSDK 
+else
+neutrino_LDADD += -lnxp
+endif
+
 
 bin_PROGRAMS += drivertool
 
diff --git a/src/daemonc/Makefile.am b/src/daemonc/Makefile.am
index 076234a8e..bd22d2282 100644
--- a/src/daemonc/Makefile.am
+++ b/src/daemonc/Makefile.am
@@ -13,8 +13,12 @@ INCLUDES = \
 	@FREETYPE_CFLAGS@
 
 if BOXTYPE_COOL
+if BOXMODEL_APOLLO
+INCLUDES += -I$(top_srcdir)/lib/libcoolstream2
+else
 INCLUDES += -I$(top_srcdir)/lib/libcoolstream
 endif
+endif
 if BOXTYPE_TRIPLE
 INCLUDES += -I$(top_srcdir)/lib/libtriple
 endif
diff --git a/src/driver/Makefile.am b/src/driver/Makefile.am
index 1216726f1..7fe05bdea 100644
--- a/src/driver/Makefile.am
+++ b/src/driver/Makefile.am
@@ -42,8 +42,11 @@ if BOXTYPE_COOL
 libneutrino_driver_a_SOURCES += \
 	vfd.cpp
 
-INCLUDES += \
-	-I$(top_srcdir)/lib/libcoolstream
+if BOXMODEL_APOLLO
+INCLUDES += -I$(top_srcdir)/lib/libcoolstream2
+else
+INCLUDES += -I$(top_srcdir)/lib/libcoolstream
+endif
 endif
 if BOXTYPE_TRIPLE
 libneutrino_driver_a_SOURCES += \
diff --git a/src/driver/audiodec/Makefile.am b/src/driver/audiodec/Makefile.am
index c21b2c4d0..7062712bd 100644
--- a/src/driver/audiodec/Makefile.am
+++ b/src/driver/audiodec/Makefile.am
@@ -12,8 +12,12 @@ INCLUDES = \
 	@VORBISIDEC_CFLAGS@
 
 if BOXTYPE_COOL
+if BOXMODEL_APOLLO
+INCLUDES += -I$(top_srcdir)/lib/libcoolstream2
+else
 INCLUDES += -I$(top_srcdir)/lib/libcoolstream
 endif
+endif
 if BOXTYPE_TRIPLE
 INCLUDES += -I$(top_srcdir)/lib/libtriple
 endif
diff --git a/src/driver/pictureviewer/Makefile.am b/src/driver/pictureviewer/Makefile.am
index c70fcf859..f5aab0692 100644
--- a/src/driver/pictureviewer/Makefile.am
+++ b/src/driver/pictureviewer/Makefile.am
@@ -10,8 +10,12 @@ INCLUDES = \
 	@FREETYPE_CFLAGS@
 
 if BOXTYPE_COOL
+if BOXMODEL_APOLLO
+INCLUDES += -I$(top_srcdir)/lib/libcoolstream2
+else
 INCLUDES += -I$(top_srcdir)/lib/libcoolstream
 endif
+endif
 if BOXTYPE_TRIPLE
 INCLUDES += -I$(top_srcdir)/lib/libtriple
 endif
diff --git a/src/eitd/Makefile.am b/src/eitd/Makefile.am
index c151cd6b2..d583d3081 100644
--- a/src/eitd/Makefile.am
+++ b/src/eitd/Makefile.am
@@ -10,8 +10,12 @@ INCLUDES = \
 	-I$(top_srcdir)/lib/xmltree
 
 if BOXTYPE_COOL
+if BOXMODEL_APOLLO
+INCLUDES += -I$(top_srcdir)/lib/libcoolstream2
+else
 INCLUDES += -I$(top_srcdir)/lib/libcoolstream
 endif
+endif
 if BOXTYPE_TRIPLE
 INCLUDES += -I$(top_srcdir)/lib/libtriple
 endif
diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am
index 39c5967a5..3c9715b7c 100644
--- a/src/gui/Makefile.am
+++ b/src/gui/Makefile.am
@@ -36,8 +36,13 @@ INCLUDES = \
 	@FREETYPE_CFLAGS@
 
 if BOXTYPE_COOL
+if BOXMODEL_APOLLO
+INCLUDES += -I$(top_srcdir)/lib/libcoolstream2
+else
 INCLUDES += -I$(top_srcdir)/lib/libcoolstream
 endif
+endif
+
 if BOXTYPE_TRIPLE
 INCLUDES += -I$(top_srcdir)/lib/libtriple
 endif
diff --git a/src/gui/bedit/Makefile.am b/src/gui/bedit/Makefile.am
index d7293662f..871b56919 100644
--- a/src/gui/bedit/Makefile.am
+++ b/src/gui/bedit/Makefile.am
@@ -8,10 +8,16 @@ INCLUDES = \
 	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/lib/libeventserver \
 	-I$(top_srcdir)/lib/libconfigfile \
-	-I$(top_srcdir)/lib/libcoolstream \
 	-I$(top_srcdir)/lib/xmltree \
 	@FREETYPE_CFLAGS@
 
+if BOXTYPE_COOL
+if BOXMODEL_APOLLO
+INCLUDES += -I$(top_srcdir)/lib/libcoolstream2
+else
+INCLUDES += -I$(top_srcdir)/lib/libcoolstream
+endif
+endif
 
 noinst_LIBRARIES = libneutrino_gui_bedit.a
 
diff --git a/src/gui/widget/Makefile.am b/src/gui/widget/Makefile.am
index 4b12dbb6a..c6f89db41 100644
--- a/src/gui/widget/Makefile.am
+++ b/src/gui/widget/Makefile.am
@@ -11,8 +11,13 @@ INCLUDES = \
 	@FREETYPE_CFLAGS@
 
 if BOXTYPE_COOL
+if BOXMODEL_APOLLO
+INCLUDES += -I$(top_srcdir)/lib/libcoolstream2
+else
 INCLUDES += -I$(top_srcdir)/lib/libcoolstream
 endif
+endif
+
 if BOXTYPE_TRIPLE
 INCLUDES += -I$(top_srcdir)/lib/libtriple
 endif
diff --git a/src/nhttpd/tuxboxapi/coolstream/Makefile.am b/src/nhttpd/tuxboxapi/coolstream/Makefile.am
index f26f6d934..863663fe6 100644
--- a/src/nhttpd/tuxboxapi/coolstream/Makefile.am
+++ b/src/nhttpd/tuxboxapi/coolstream/Makefile.am
@@ -16,8 +16,12 @@ INCLUDES = \
 	@FREETYPE_CFLAGS@
 
 if BOXTYPE_COOL
+if BOXMODEL_APOLLO
+INCLUDES += -I$(top_srcdir)/lib/libcoolstream2
+else
 INCLUDES += -I$(top_srcdir)/lib/libcoolstream
 endif
+endif
 if BOXTYPE_TRIPLE
 INCLUDES += -I$(top_srcdir)/lib/libtriple
 endif
diff --git a/src/system/Makefile.am b/src/system/Makefile.am
index 1e42f4a63..081507c44 100644
--- a/src/system/Makefile.am
+++ b/src/system/Makefile.am
@@ -15,8 +15,12 @@ INCLUDES = \
 	@FREETYPE_CFLAGS@
 
 if BOXTYPE_COOL
+if BOXMODEL_APOLLO
+INCLUDES += -I$(top_srcdir)/lib/libcoolstream2
+else
 INCLUDES += -I$(top_srcdir)/lib/libcoolstream
 endif
+endif
 if BOXTYPE_TRIPLE
 INCLUDES += -I$(top_srcdir)/lib/libtriple
 endif
diff --git a/src/zapit/src/Makefile.am b/src/zapit/src/Makefile.am
index b63a0641f..970b026f4 100644
--- a/src/zapit/src/Makefile.am
+++ b/src/zapit/src/Makefile.am
@@ -12,8 +12,12 @@ INCLUDES = \
 	-I$(top_srcdir)/lib/xmltree
 
 if BOXTYPE_COOL
+if BOXMODEL_APOLLO
+INCLUDES += -I$(top_srcdir)/lib/libcoolstream2
+else
 INCLUDES += -I$(top_srcdir)/lib/libcoolstream
 endif
+endif
 if BOXTYPE_TRIPLE
 INCLUDES += -I$(top_srcdir)/lib/libtriple
 endif
diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp
index 8e29bad9a..29a623305 100644
--- a/src/zapit/src/zapit.cpp
+++ b/src/zapit/src/zapit.cpp
@@ -2036,6 +2036,7 @@ bool CZapit::Start(Z_start_arg *ZapStart_arg)
 	audioDemux = new cDemux();
 	audioDemux->Open(DMX_AUDIO_CHANNEL);
 
+#ifdef BOXMODEL_APOLLO
 	videoDecoder = cVideo::GetDecoder(0);
 	audioDecoder = cAudio::GetDecoder(0);
 
@@ -2045,6 +2046,12 @@ bool CZapit::Start(Z_start_arg *ZapStart_arg)
 
 	audioDecoder->SetDemux(audioDemux);
 	audioDecoder->SetVideo(videoDecoder);
+#else
+        videoDecoder = new cVideo(video_mode, videoDemux->getChannel(), videoDemux->getBuffer());
+        videoDecoder->Standby(false);
+
+        audioDecoder = new cAudio(audioDemux->getBuffer(), videoDecoder->GetTVEnc(), NULL /*videoDecoder->GetTVEncSD()*/);
+#endif
 
 	videoDecoder->SetAudioHandle(audioDecoder->GetHandle());