diff --git a/configure.ac b/configure.ac
index bed886f51..c1fed8562 100644
--- a/configure.ac
+++ b/configure.ac
@@ -437,6 +437,7 @@ src/Makefile
 src/daemonc/Makefile
 src/driver/Makefile
 src/driver/audiodec/Makefile
+src/driver/glcd/Makefile
 src/driver/pictureviewer/Makefile
 src/eitd/Makefile
 src/gui/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 7374d58a3..0e1cab9d9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -132,7 +132,9 @@ neutrino_LDADD = \
 	-lz
 
 if ENABLE_GRAPHLCD
-neutrino_LDADD += -lglcddrivers -lglcdgraphics -lusb-1.0
+neutrino_LDADD += \
+	driver/glcd/libneutrino_driver_glcd.a \
+	-lglcddrivers -lglcdgraphics -lusb-1.0
 endif
 
 if ENABLE_GIFLIB
diff --git a/src/driver/Makefile.am b/src/driver/Makefile.am
index 8ccc4ed0c..aadefd977 100644
--- a/src/driver/Makefile.am
+++ b/src/driver/Makefile.am
@@ -2,6 +2,10 @@ AM_CXXFLAGS = -fno-rtti -fno-exceptions -D__STDC_FORMAT_MACROS
 
 SUBDIRS = pictureviewer audiodec
 
+if ENABLE_GRAPHLCD
+SUBDIRS += glcd
+endif
+
 AM_CPPFLAGS = \
 	-I$(top_builddir) \
 	-I$(top_srcdir) \
@@ -52,17 +56,6 @@ libneutrino_driver_a_SOURCES += \
 	lcd4l.cpp
 endif
 
-if ENABLE_GRAPHLCD
-libneutrino_driver_a_SOURCES += \
-	analogclock.cpp \
-	digitalclock.cpp \
-	lcdclock.cpp \
-	ledclock.cpp \
-	simpleclock.cpp \
-	weather.cpp \
-	glcd.cpp
-endif
-
 if BOXTYPE_COOL
 libneutrino_driver_a_SOURCES += \
 	fb_accel_cs_hdx.cpp
diff --git a/src/driver/display.h b/src/driver/display.h
index f588ceb0a..f15d7d500 100644
--- a/src/driver/display.h
+++ b/src/driver/display.h
@@ -9,5 +9,5 @@
 #include <driver/simple_display.h>
 #endif
 #ifdef ENABLE_GRAPHLCD
-#include <driver/glcd.h>
+#include <driver/glcd/glcd.h>
 #endif
diff --git a/src/driver/glcd/Makefile.am b/src/driver/glcd/Makefile.am
new file mode 100644
index 000000000..2f5307211
--- /dev/null
+++ b/src/driver/glcd/Makefile.am
@@ -0,0 +1,25 @@
+AM_CXXFLAGS = -fno-rtti -fno-exceptions
+
+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 \
+	@SIGC_CFLAGS@ \
+	@FREETYPE_CFLAGS@ \
+	@LUA_CFLAGS@ \
+	@HWLIB_CFLAGS@
+
+noinst_LIBRARIES = libneutrino_driver_glcd.a
+
+libneutrino_driver_glcd_a_SOURCES = \
+	analogclock.cpp \
+	digitalclock.cpp \
+	lcdclock.cpp \
+	ledclock.cpp \
+	simpleclock.cpp \
+	weather.cpp \
+	glcd.cpp
diff --git a/src/driver/analogclock.cpp b/src/driver/glcd/analogclock.cpp
similarity index 99%
rename from src/driver/analogclock.cpp
rename to src/driver/glcd/analogclock.cpp
index b31965257..f53ed4558 100644
--- a/src/driver/analogclock.cpp
+++ b/src/driver/glcd/analogclock.cpp
@@ -28,7 +28,7 @@
 #include <neutrino.h>
 #include <math.h>
 #include <cstdio>
-#include <driver/analogclock.h>
+#include "analogclock.h"
 #include <system/helpers.h>
 
 enum files
diff --git a/src/driver/analogclock.h b/src/driver/glcd/analogclock.h
similarity index 100%
rename from src/driver/analogclock.h
rename to src/driver/glcd/analogclock.h
diff --git a/src/driver/digitalclock.cpp b/src/driver/glcd/digitalclock.cpp
similarity index 99%
rename from src/driver/digitalclock.cpp
rename to src/driver/glcd/digitalclock.cpp
index e86b7449a..c8b29d16d 100644
--- a/src/driver/digitalclock.cpp
+++ b/src/driver/glcd/digitalclock.cpp
@@ -27,7 +27,7 @@
 #include <global.h>
 #include <neutrino.h>
 #include <cstdio>
-#include <driver/digitalclock.h>
+#include "digitalclock.h"
 #include <system/helpers.h>
 
 #include <driver/pictureviewer/pictureviewer.h>
diff --git a/src/driver/digitalclock.h b/src/driver/glcd/digitalclock.h
similarity index 100%
rename from src/driver/digitalclock.h
rename to src/driver/glcd/digitalclock.h
diff --git a/src/driver/glcd.cpp b/src/driver/glcd/glcd.cpp
similarity index 99%
rename from src/driver/glcd.cpp
rename to src/driver/glcd/glcd.cpp
index a4b731311..81d50dedd 100644
--- a/src/driver/glcd.cpp
+++ b/src/driver/glcd/glcd.cpp
@@ -35,10 +35,10 @@
 #include <gui/movieplayer.h>
 #include <driver/pictureviewer/pictureviewer.h>
 #include <hardware_caps.h>
-#include <driver/glcd.h>
 #include <eitd/sectionsd.h>
 #include <math.h>
 
+#include "glcd.h"
 #include "analogclock.h"
 #include "digitalclock.h"
 #include "lcdclock.h"
diff --git a/src/driver/glcd.h b/src/driver/glcd/glcd.h
similarity index 100%
rename from src/driver/glcd.h
rename to src/driver/glcd/glcd.h
diff --git a/src/driver/lcdclock.cpp b/src/driver/glcd/lcdclock.cpp
similarity index 98%
rename from src/driver/lcdclock.cpp
rename to src/driver/glcd/lcdclock.cpp
index 3e2106834..39162775e 100644
--- a/src/driver/lcdclock.cpp
+++ b/src/driver/glcd/lcdclock.cpp
@@ -27,7 +27,7 @@
 #include <global.h>
 #include <neutrino.h>
 #include <cstdio>
-#include <driver/lcdclock.h>
+#include "lcdclock.h"
 
 static bool fonts_initialized = false;
 
diff --git a/src/driver/lcdclock.h b/src/driver/glcd/lcdclock.h
similarity index 100%
rename from src/driver/lcdclock.h
rename to src/driver/glcd/lcdclock.h
diff --git a/src/driver/ledclock.cpp b/src/driver/glcd/ledclock.cpp
similarity index 98%
rename from src/driver/ledclock.cpp
rename to src/driver/glcd/ledclock.cpp
index b18489c65..7d29b3111 100644
--- a/src/driver/ledclock.cpp
+++ b/src/driver/glcd/ledclock.cpp
@@ -27,7 +27,7 @@
 #include <global.h>
 #include <neutrino.h>
 #include <cstdio>
-#include <driver/ledclock.h>
+#include "ledclock.h"
 
 static bool fonts_initialized = false;
 
diff --git a/src/driver/ledclock.h b/src/driver/glcd/ledclock.h
similarity index 100%
rename from src/driver/ledclock.h
rename to src/driver/glcd/ledclock.h
diff --git a/src/driver/simpleclock.cpp b/src/driver/glcd/simpleclock.cpp
similarity index 98%
rename from src/driver/simpleclock.cpp
rename to src/driver/glcd/simpleclock.cpp
index d5685cde9..d29497b0b 100644
--- a/src/driver/simpleclock.cpp
+++ b/src/driver/glcd/simpleclock.cpp
@@ -27,7 +27,7 @@
 #include <global.h>
 #include <neutrino.h>
 #include <cstdio>
-#include <driver/simpleclock.h>
+#include "simpleclock.h"
 
 static bool fonts_initialized = false;
 
diff --git a/src/driver/simpleclock.h b/src/driver/glcd/simpleclock.h
similarity index 100%
rename from src/driver/simpleclock.h
rename to src/driver/glcd/simpleclock.h
diff --git a/src/driver/weather.cpp b/src/driver/glcd/weather.cpp
similarity index 99%
rename from src/driver/weather.cpp
rename to src/driver/glcd/weather.cpp
index 47555f6e5..3b40a87aa 100644
--- a/src/driver/weather.cpp
+++ b/src/driver/glcd/weather.cpp
@@ -23,7 +23,7 @@
 
 #include <config.h>
 #include <cstdio>
-#include <driver/weather.h>
+#include "weather.h"
 #include <gui/weather.h>
 #include <system/helpers.h>
 
diff --git a/src/driver/weather.h b/src/driver/glcd/weather.h
similarity index 100%
rename from src/driver/weather.h
rename to src/driver/glcd/weather.h
diff --git a/src/gui/glcdsetup.cpp b/src/gui/glcdsetup.cpp
index a87ae7a3e..ffcd569ca 100644
--- a/src/gui/glcdsetup.cpp
+++ b/src/gui/glcdsetup.cpp
@@ -30,7 +30,7 @@
 #include <driver/fontrenderer.h>
 #include <driver/rcinput.h>
 #include <daemonc/remotecontrol.h>
-#include <driver/glcd.h>
+#include <driver/glcd/glcd.h>
 #include <driver/screen_max.h>
 #include <system/helpers.h>
 #include "glcdsetup.h"
diff --git a/src/gui/glcdsetup.h b/src/gui/glcdsetup.h
index 54a1994f9..258d27257 100644
--- a/src/gui/glcdsetup.h
+++ b/src/gui/glcdsetup.h
@@ -29,7 +29,7 @@
 #include <string.h>
 #include <system/setting_helpers.h>
 #include <system/settings.h>
-#include <driver/glcd.h>
+#include <driver/glcd/glcd.h>
 #include <gui/widget/menue.h>
 
 class GLCD_Menu : public CMenuTarget, public CChangeObserver