diff --git a/configure.ac b/configure.ac
index f5e82089c..0e7a39895 100644
--- a/configure.ac
+++ b/configure.ac
@@ -176,6 +176,7 @@ src/driver/audiodec/Makefile
 src/driver/Makefile
 src/gui/Makefile
 src/gui/bedit/Makefile
+src/gui/components/Makefile
 src/gui/widget/Makefile
 src/system/Makefile
 data/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 93560a0cb..dd1b2ebed 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -48,6 +48,7 @@ endif
 neutrino_LDADD = \
 	daemonc/libneutrino_daemonc.a \
 	gui/bedit/libneutrino_gui_bedit.a \
+	gui/components/libneutrino_gui_components.a \
 	gui/libtimerlist.a \
 	gui/libneutrino_gui.a \
 	gui/widget/libneutrino_gui_widget.a \
diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am
index 4f084a469..4da8fc6a1 100644
--- a/src/gui/Makefile.am
+++ b/src/gui/Makefile.am
@@ -18,7 +18,7 @@ noinst_HEADERS = git_version.h
 .PHONY: makeversion
 
 
-SUBDIRS = widget bedit
+SUBDIRS = bedit components widget
 
 INCLUDES = \
 	-I$(top_builddir) \
diff --git a/src/gui/audioplayer.h b/src/gui/audioplayer.h
index e4f0c6894..74284ed4a 100644
--- a/src/gui/audioplayer.h
+++ b/src/gui/audioplayer.h
@@ -37,7 +37,7 @@
 #include <driver/framebuffer.h>
 #include <driver/audiofile.h>
 #include <gui/filebrowser.h>
-#include <gui/widget/components.h>
+#include <gui/components/cc.h>
 #include <gui/widget/menue.h>
 
 #include <xmltree/xmlinterface.h>
diff --git a/src/gui/bedit/bouqueteditor_channels.h b/src/gui/bedit/bouqueteditor_channels.h
index bcc653e74..d3132af0d 100644
--- a/src/gui/bedit/bouqueteditor_channels.h
+++ b/src/gui/bedit/bouqueteditor_channels.h
@@ -35,7 +35,7 @@
 
 #include <driver/framebuffer.h>
 #include <gui/widget/menue.h>
-#include <gui/widget/components.h>
+#include <gui/components/cc.h>
 #include <zapit/client/zapitclient.h>
 
 #include <string>
diff --git a/src/gui/bedit/bouqueteditor_chanselect.h b/src/gui/bedit/bouqueteditor_chanselect.h
index 963862550..58ad2ebf3 100644
--- a/src/gui/bedit/bouqueteditor_chanselect.h
+++ b/src/gui/bedit/bouqueteditor_chanselect.h
@@ -34,7 +34,7 @@
 
 #include <driver/framebuffer.h>
 #include <gui/widget/listbox.h>
-#include <gui/widget/components.h>
+#include <gui/components/cc.h>
 #include <zapit/client/zapitclient.h>
 
 #include <string>
diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp
index 5efe68fd9..7e78f77a4 100644
--- a/src/gui/channellist.cpp
+++ b/src/gui/channellist.cpp
@@ -55,7 +55,7 @@
 #include <gui/widget/icons.h>
 #include <gui/widget/messagebox.h>
 #include <gui/widget/progressbar.h>
-#include <gui/widget/components.h>
+#include <gui/components/cc.h>
 
 #include <system/settings.h>
 #include <gui/customcolor.h>
diff --git a/src/gui/components/Makefile.am b/src/gui/components/Makefile.am
new file mode 100644
index 000000000..5765a440c
--- /dev/null
+++ b/src/gui/components/Makefile.am
@@ -0,0 +1,20 @@
+AM_CPPFLAGS = -fno-rtti -fno-exceptions
+
+INCLUDES = \
+	-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/libcoolstream \
+	-I$(top_srcdir)/lib/xmltree \
+	@FREETYPE_CFLAGS@
+
+
+noinst_LIBRARIES = libneutrino_gui_components.a
+
+
+libneutrino_gui_components_a_SOURCES = \
+	components.cpp
diff --git a/src/gui/widget/components.h b/src/gui/components/cc.h
similarity index 94%
rename from src/gui/widget/components.h
rename to src/gui/components/cc.h
index c7ec2586a..522146dfc 100644
--- a/src/gui/widget/components.h
+++ b/src/gui/components/cc.h
@@ -1,9 +1,9 @@
 /*
-	GUI window component classes - Neutrino-GUI
+	Based up Neutrino-GUI - Tuxbox-Project 
+	Copyright (C) 2001 by Steffen Hehn 'McClean'
 
-	Copyright(C) 2012, Thilo Graf (dbt)
-
-	This class contains generic components for GUI-related parts.
+	Classes for generic for GUI-related components.
+	Copyright (C) 2012, 2013, Thilo Graf 'dbt'
 
 	License: GPL
 
diff --git a/src/gui/widget/components.cpp b/src/gui/components/components.cpp
similarity index 96%
rename from src/gui/widget/components.cpp
rename to src/gui/components/components.cpp
index be43e39b5..63893826f 100644
--- a/src/gui/widget/components.cpp
+++ b/src/gui/components/components.cpp
@@ -1,9 +1,10 @@
 /*
-	GUI window component classes - Neutrino-GUI
+	Based up Neutrino-GUI - Tuxbox-Project 
+	Copyright (C) 2001 by Steffen Hehn 'McClean'
 
-	Copyright(C) 2012, Thilo Graf (dbt)
-
-	This class contains generic components for GUI-related parts.
+	Classes for generic for GUI-related components.
+	Copyright (C) 2012, 2013, Thilo Graf 'dbt'
+	Copyright (C) 2012, Michael Liebmann 'micha-bbg'
 
 	License: GPL
 
@@ -29,7 +30,7 @@
 
 #include <global.h>
 #include <neutrino.h>
-#include <gui/widget/components.h>
+#include "cc.h"
 
 
 
diff --git a/src/gui/widget/Makefile.am b/src/gui/widget/Makefile.am
index 4b12dbb6a..6cdfee1fe 100644
--- a/src/gui/widget/Makefile.am
+++ b/src/gui/widget/Makefile.am
@@ -22,7 +22,6 @@ noinst_LIBRARIES = libneutrino_gui_widget.a libneutrino_gui_widget2.a
 libneutrino_gui_widget_a_SOURCES = \
 	buttons.cpp \
 	colorchooser.cpp \
-	components.cpp \
 	drawable.cpp \
 	helpbox.cpp \
 	hintbox.cpp \
diff --git a/src/gui/widget/menue.h b/src/gui/widget/menue.h
index 1d694afa9..d5d33db33 100644
--- a/src/gui/widget/menue.h
+++ b/src/gui/widget/menue.h
@@ -41,7 +41,7 @@
 #include <system/localize.h>
 #include <gui/widget/icons.h>
 #include <gui/color.h>
-#include <gui/widget/components.h>
+#include <gui/components/cc.h>
 
 #include <string>
 #include <vector>