diff --git a/configure.ac b/configure.ac
index c1fa6e618..430ddd5de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -353,6 +353,7 @@ src/gui/Makefile
 src/gui/bedit/Makefile
 src/gui/components/Makefile
 src/gui/lua/Makefile
+src/gui/moviebrowser/Makefile
 src/gui/widget/Makefile
 src/system/Makefile
 src/system/mtdutils/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 503ed1ef4..1664576da 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -83,6 +83,7 @@ neutrino_LDADD = \
 	driver/pictureviewer/libneutrino_pictureviewer.a \
 	$(MTDUTILSLIBS) \
 	gui/movieinfo.o \
+	gui/moviebrowser/mb.o \
 	gui/libneutrino_gui2.a \
 	gui/components/libneutrino_gui_components.a \
 	$(LUALIBS) \
diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am
index 1a2377152..36302e921 100644
--- a/src/gui/Makefile.am
+++ b/src/gui/Makefile.am
@@ -15,7 +15,7 @@ version.h:
 noinst_HEADERS = version.h
 .PHONY: version.h
 
-SUBDIRS = bedit components widget
+SUBDIRS = bedit components moviebrowser widget
 
 if ENABLE_LUA
 SUBDIRS += lua
@@ -72,7 +72,6 @@ libneutrino_gui_a_SOURCES = \
 	mediaplayer.cpp \
 	mediaplayer_setup.cpp \
 	miscsettings_menu.cpp \
-	moviebrowser.cpp \
 	movieinfo.cpp \
 	movieplayer.cpp \
 	network_service.cpp \
diff --git a/src/gui/epgplus.cpp b/src/gui/epgplus.cpp
index d84232a78..ebef9e3a9 100644
--- a/src/gui/epgplus.cpp
+++ b/src/gui/epgplus.cpp
@@ -35,7 +35,7 @@
 #include <gui/followscreenings.h>
 #include <gui/epgplus.h>
 #include <gui/epgview.h>
-#include <gui/moviebrowser.h>
+#include <gui/moviebrowser/mb.h>
 #include <sectionsdclient/sectionsdclient.h>
 #include <timerdclient/timerdclient.h>
 
diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp
index 9c2c45963..36ec188a7 100644
--- a/src/gui/epgview.cpp
+++ b/src/gui/epgview.cpp
@@ -47,7 +47,7 @@
 #include <driver/fade.h>
 #include <gui/filebrowser.h>
 #include <gui/followscreenings.h>
-#include <gui/moviebrowser.h>
+#include <gui/moviebrowser/mb.h>
 #include <gui/movieplayer.h>
 #include <gui/customcolor.h>
 #include <gui/pictureviewer.h>
diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp
index 429cc8c71..90f76aa7a 100644
--- a/src/gui/eventlist.cpp
+++ b/src/gui/eventlist.cpp
@@ -34,7 +34,7 @@
 #include <gui/epgplus.h>
 #include <gui/epgview.h>
 #include <gui/followscreenings.h>
-#include <gui/moviebrowser.h>
+#include <gui/moviebrowser/mb.h>
 #include <gui/timerlist.h>
 #include <gui/user_menue.h>
 
diff --git a/src/gui/mediaplayer_setup.cpp b/src/gui/mediaplayer_setup.cpp
index c2894739d..bb18e8333 100644
--- a/src/gui/mediaplayer_setup.cpp
+++ b/src/gui/mediaplayer_setup.cpp
@@ -45,7 +45,7 @@
 #include <gui/audioplayer_setup.h>
 #include <gui/pictureviewer_setup.h>
 #include <gui/webtv_setup.h>
-#include <gui/moviebrowser.h>
+#include <gui/moviebrowser/mb.h>
 
 #include <driver/screen_max.h>
 
diff --git a/src/gui/moviebrowser/Makefile.am b/src/gui/moviebrowser/Makefile.am
new file mode 100644
index 000000000..46379f2ca
--- /dev/null
+++ b/src/gui/moviebrowser/Makefile.am
@@ -0,0 +1,20 @@
+AM_CPPFLAGS = -fno-rtti -fno-exceptions -D__STDC_FORMAT_MACROS
+
+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/libeventserver \
+	-I$(top_srcdir)/lib/libconfigfile \
+	-I$(top_srcdir)/lib/xmltree \
+	@SIGC_CFLAGS@ \
+	@FREETYPE_CFLAGS@ \
+	@HWLIB_CFLAGS@
+
+noinst_LIBRARIES = libneutrino_gui_moviebrowser.a
+
+
+libneutrino_gui_moviebrowser_a_SOURCES = \
+	mb.cpp
diff --git a/src/gui/moviebrowser.cpp b/src/gui/moviebrowser/mb.cpp
similarity index 99%
rename from src/gui/moviebrowser.cpp
rename to src/gui/moviebrowser/mb.cpp
index 9b660d21c..f589c8643 100644
--- a/src/gui/moviebrowser.cpp
+++ b/src/gui/moviebrowser/mb.cpp
@@ -27,7 +27,7 @@
 
 	Date:	   Nov 2005
 
-	Author: Günther@tuxbox.berlios.org
+	Author: Günther@tuxbox.berlios.org
 		based on code of Steffen Hehn 'McClean'
 
 	(C) 2009-2015 Stefan Seyfried
@@ -43,8 +43,8 @@
 
 #include <algorithm>
 #include <cstdlib>
-#include "moviebrowser.h"
-#include "filebrowser.h"
+#include "mb.h"
+#include <gui/filebrowser.h>
 #include <gui/tmdb.h>
 #include <gui/epgview.h>
 #include <gui/widget/hintbox.h>
@@ -1502,7 +1502,7 @@ void CMovieBrowser::refreshMovieInfo(void)
 			int w_logo = ratio*CChannelLogo->getWidth()/100;
 			CChannelLogo->setWidth(min(w_logo, logo_w_max));
 		}
-		
+
 		lx = m_cBoxFrame.iX+m_cBoxFrameTitleRel.iX+m_cBoxFrameTitleRel.iWidth-CChannelLogo->getWidth()-10;
 		ly = m_cBoxFrameTitleRel.iY+m_cBoxFrame.iY+ (m_cBoxFrameTitleRel.iHeight-CChannelLogo->getHeight())/2;
 		CChannelLogo->setXPos(lx - pb_hdd_offset);
diff --git a/src/gui/moviebrowser.h b/src/gui/moviebrowser/mb.h
similarity index 99%
rename from src/gui/moviebrowser.h
rename to src/gui/moviebrowser/mb.h
index 4f502ded9..a1a5a3a33 100644
--- a/src/gui/moviebrowser.h
+++ b/src/gui/moviebrowser/mb.h
@@ -1,7 +1,7 @@
 /***************************************************************************
 	Neutrino-GUI  -   DBoxII-Project
 
- 	Homepage: http://dbox.cyberphoria.org/
+	Homepage: http://dbox.cyberphoria.org/
 
 	$Id: moviebrowser.h,v 1.5 2006/09/11 21:11:35 guenther Exp $
 
@@ -37,7 +37,7 @@
 
 	Date:	   Nov 2005
 
-	Author: Günther@tuxbox.berlios.org
+	Author: Günther@tuxbox.berlios.org
 		based on code of Steffen Hehn 'McClean'
 
 	$Log: moviebrowser.h,v $
@@ -74,9 +74,9 @@
 #include <string>
 #include <vector>
 #include <list>
-#include <gui/widget/listframe.h>
 #include <gui/widget/menue.h>
 #include <gui/widget/textbox.h>
+#include <gui/widget/listframe.h>
 #include <gui/movieinfo.h>
 #include <driver/file.h>
 #include <driver/fb_window.h>
@@ -387,7 +387,7 @@ class CMovieBrowser : public CMenuTarget
 		void setMode(int mode) {
 			if (show_mode != mode)
 				m_file_info_stale = true;
-			show_mode = mode; 
+			show_mode = mode;
 		}
 		bool gotMovie(const char *rec_title);
 
@@ -654,7 +654,3 @@ const CMenuOptionChooser::keyval GENRE_ALL[GENRE_ALL_COUNT] =
 };
 
 #endif /*MOVIEBROWSER_H_*/
-
-
-
-
diff --git a/src/gui/movieplayer.h b/src/gui/movieplayer.h
index cce01eac0..818b1054f 100644
--- a/src/gui/movieplayer.h
+++ b/src/gui/movieplayer.h
@@ -38,7 +38,7 @@
 #include <gui/filebrowser.h>
 #include <gui/bookmarkmanager.h>
 #include <gui/widget/menue.h>
-#include <gui/moviebrowser.h>
+#include <gui/moviebrowser/mb.h>
 #include <gui/movieinfo.h>
 #include <gui/widget/hintbox.h>
 #include <gui/timeosd.h>