diff --git a/lib/dvb/teletext.cpp b/lib/dvb/teletext.cpp
index de4c6d7..1c7579f 100644
--- a/lib/dvb/teletext.cpp
+++ b/lib/dvb/teletext.cpp
@@ -655,7 +655,7 @@ void eDVBTeletextParser::connectNewPage(const Slot1<void, const eDVBTeletextSubt
 
 void eDVBTeletextParser::addSubtitleString(int color, std::string string)
 {
-//	eDebug("(%d)add subtitle string: %s, col %d", m_Y, string.c_str(), color);
+	//eDebug("(%d)add subtitle string: %s, col %d", m_Y, string.c_str(), color);
 	int force_cell = 0;
 
 	if (string.substr(0, 2) == "- ")
@@ -664,21 +664,30 @@ void eDVBTeletextParser::addSubtitleString(int color, std::string string)
 		force_cell = 1;
 	}
 
-//	eDebug("color %d, m_subtitle_color %d", color, m_subtitle_color);
+	//eDebug("color %d, m_subtitle_color %d", color, m_subtitle_color);
 	gRGB rgbcol((color & 1) ? 255 : 128, (color & 2) ? 255 : 128, (color & 4) ? 255 : 128);
-	if ((color != m_subtitle_color || force_cell) && !m_subtitle_text.empty() && ((color == -2) || !string.empty()))
+	if ((color != m_subtitle_color || force_cell) && (!m_subtitle_line1.empty() || !m_subtitle_line2.empty()) && (color == -2))
 	{
-//		eDebug("add text |%s|: %d != %d || %d", m_subtitle_text.c_str(), color, m_subtitle_color, force_cell);
-		m_subtitle_page.m_elements.push_back(eDVBTeletextSubtitlePageElement(rgbcol, m_subtitle_text));
-		m_subtitle_text = "";
-	} else if (!m_subtitle_text.empty() && m_subtitle_text[m_subtitle_text.size()-1] != ' ')
-		m_subtitle_text += " ";
+		//eDebug("add text |%s|: %d != %d || %d", m_subtitle_line1.c_str(), color, m_subtitle_color, force_cell);
+		//eDebug("Subtitle line 1: %s", m_subtitle_line1.c_str());
+		//eDebug("Subtitle line 2: %s", m_subtitle_line2.c_str());
+		m_subtitle_page.m_elements.push_back(eDVBTeletextSubtitlePageElement(rgbcol, m_subtitle_line1, m_subtitle_line2));
+		m_subtitle_line1 = "";
+		m_subtitle_line2 = "";
+	}
 	
 	if (!string.empty())
 	{
-//		eDebug("set %d as new color", color);
+		//eDebug("set %d as new color", color);
 		m_subtitle_color = color;
-		m_subtitle_text += string;
+		if (m_subtitle_line1.empty())
+		{
+			m_subtitle_line1 = string;
+		}
+		else
+		{
+			m_subtitle_line2 = string;
+		}
 	}
 }
 
@@ -688,7 +697,7 @@ void eDVBTeletextParser::sendSubtitlePage()
 	bool empty=true;
 	if (empty)
 		for (unsigned int i = 0; i < m_subtitle_page.m_elements.size(); ++i)
-			if (!m_subtitle_page.m_elements[i].m_text.empty())
+			if (!m_subtitle_page.m_elements[i].m_line1.empty())
 				empty=false;
 	if (!empty)
 		m_new_subtitle_page(m_subtitle_page);
diff --git a/lib/dvb/teletext.h b/lib/dvb/teletext.h
index 880fa56..e1a8ea8 100644
--- a/lib/dvb/teletext.h
+++ b/lib/dvb/teletext.h
@@ -11,10 +11,11 @@
 struct eDVBTeletextSubtitlePageElement
 {
 	gRGB m_color;
-	std::string m_text;
+	std::string m_line1;
+	std::string m_line2;
 	eRect m_area;
-	eDVBTeletextSubtitlePageElement(const gRGB &color, const std::string &text)
-		: m_color(color), m_text(text)
+	eDVBTeletextSubtitlePageElement(const gRGB &color, const std::string &line1, const std::string &line2)
+		: m_color(color), m_line1(line1), m_line2(line2)
 	{
 	}
 };
@@ -57,7 +58,8 @@ private:
 	void handleLine(unsigned char *line, int len);
 	void handlePageEnd(int have_pts, const pts_t &pts);
 	
-	std::string m_subtitle_text;
+	std::string m_subtitle_line1;
+	std::string m_subtitle_line2;
 	int m_subtitle_color;
 	
 	void addSubtitleString(int color, std::string string);
diff --git a/lib/gdi/gfbdc.cpp b/lib/gdi/gfbdc.cpp
index d2f8dad..1cdf247 100644
--- a/lib/gdi/gfbdc.cpp
+++ b/lib/gdi/gfbdc.cpp
@@ -227,6 +227,16 @@ void gFBDC::setResolution(int xres, int yres)
 	m_pixmap = new gPixmap(&surface);
 }
 
+int gFBDC::getHorizontalResolution()
+{
+	return m_xres;
+}
+
+int gFBDC::getVerticalResolution()
+{
+	return m_yres;
+}
+
 void gFBDC::saveSettings()
 {
 }
diff --git a/lib/gdi/gfbdc.h b/lib/gdi/gfbdc.h
index 23051c4..448eb5b 100644
--- a/lib/gdi/gfbdc.h
+++ b/lib/gdi/gfbdc.h
@@ -27,6 +27,8 @@ class gFBDC: public gDC
 #endif
 public:
 	void setResolution(int xres, int yres);
+	int getVerticalResolution();
+	int getHorizontalResolution();
 #ifndef SWIG
 	void reloadSettings();
 	void setAlpha(int alpha);
diff --git a/lib/gui/esubtitle.cpp b/lib/gui/esubtitle.cpp
index ca5c20d..cad287d 100644
--- a/lib/gui/esubtitle.cpp
+++ b/lib/gui/esubtitle.cpp
@@ -1,7 +1,11 @@
 #include <lib/gui/esubtitle.h>
 #include <lib/gdi/grc.h>
 #include <lib/base/estring.h>
-
+#include <cmath>
+#ifdef WITH_SDL
+#include <lib/gdi/sdl.h>
+#endif
+#include <lib/gdi/gfbdc.h>
 	/*
 		ok, here's much room for improvements.
 	
@@ -17,6 +21,16 @@ eSubtitleWidget::eSubtitleWidget(eWidget *parent)
 	m_page_ok = 0;
 	m_dvb_page_ok = 0;
 	m_pango_page_ok = 0;
+#ifdef WITH_SDL
+	ePtr<gSDLDC> my_dc;
+	gSDLDC::getInstance(my_dc);
+#else
+	ePtr<gFBDC> my_dc;
+	gFBDC::getInstance(my_dc);
+#endif
+	fontSize = std::ceil(28 * my_dc->getVerticalResolution() / 576); // PAL (576 lines) is default. For HD (more vertical resolution) we will increase font size, for NTSC we will decrease.
+	lineHeight = std::ceil(fontSize * 1.3);
+	//eDebug("Subtitle font size is %d", fontSize);
 	CONNECT(m_hide_subtitles_timer->timeout, eSubtitleWidget::clearPage);
 }
 
@@ -53,13 +67,13 @@ void eSubtitleWidget::setPage(const eDVBTeletextSubtitlePage &p)
 
 void eSubtitleWidget::setPage(const eDVBSubtitlePage &p)
 {
-	eDebug("setPage");
+	//eDebug("setPage");
 	m_dvb_page = p;
 	invalidate(m_visible_region);  // invalidate old visible regions
 	m_visible_region.rects.clear();
 	for (std::list<eDVBSubtitleRegion>::iterator it(m_dvb_page.m_regions.begin()); it != m_dvb_page.m_regions.end(); ++it)
 	{
-		eDebug("add %d %d %d %d", it->m_position.x(), it->m_position.y(), it->m_pixmap->size().width(), it->m_pixmap->size().height());
+		//eDebug("add %d %d %d %d", it->m_position.x(), it->m_position.y(), it->m_pixmap->size().width(), it->m_pixmap->size().height());
 		m_visible_region.rects.push_back(eRect(it->m_position, it->m_pixmap->size()));
 	}
 	m_dvb_page_ok = 1;
@@ -100,7 +114,7 @@ void eSubtitleWidget::setPage(const ePangoSubtitlePage &p)
 
 void eSubtitleWidget::clearPage()
 {
-	eDebug("subtitle timeout... hide");
+	//eDebug("subtitle timeout... hide");
 	m_page_ok = 0;
 	m_dvb_page_ok = 0;
 	m_pango_page_ok = 0;
@@ -131,7 +145,8 @@ int eSubtitleWidget::event(int event, void *data, void *data2)
 		else if (m_page_ok)
 		{
 			int elements = m_page.m_elements.size();
-			ePtr<gFont> font = new gFont("Regular", 38);
+			bool didMove = false;
+			ePtr<gFont> font = new gFont("Regular", fontSize);
 			painter.setFont(font);
 			for (int i=0; i<elements; ++i)
 			{
@@ -139,16 +154,38 @@ int eSubtitleWidget::event(int event, void *data, void *data2)
 				eRect &area = element.m_area;
 				eRect shadow = area;
 				shadow.moveBy(3,3);
-				painter.setForegroundColor(gRGB(0,0,0));
-				painter.renderText(shadow, element.m_text, gPainter::RT_WRAP|gPainter::RT_VALIGN_CENTER|gPainter::RT_HALIGN_CENTER);
-				painter.setForegroundColor(element.m_color);
-				painter.renderText(area, element.m_text, gPainter::RT_WRAP|gPainter::RT_VALIGN_CENTER|gPainter::RT_HALIGN_CENTER);
+				if (!element.m_line1.empty())
+				{
+					//eDebug("Rendering subtitle line 1 %s at yPos %d", element.m_line1.c_str(), area.top());
+					painter.setForegroundColor(gRGB(0,0,0));
+					painter.renderText(shadow, element.m_line1, gPainter::RT_VALIGN_CENTER|gPainter::RT_HALIGN_CENTER);
+					painter.setForegroundColor(gRGB(255,255,255)); // TODO: make subtitle color a setting somewhere?
+					painter.renderText(area, element.m_line1, gPainter::RT_VALIGN_CENTER|gPainter::RT_HALIGN_CENTER);
+					shadow.moveBy(0, lineHeight);
+					area.moveBy(0, lineHeight);
+					didMove = true;
+				}
+				if (!element.m_line2.empty())
+				{
+					//eDebug("Rendering subtitle line 2 %s at yPos %d", element.m_line2.c_str(), area.top());
+					painter.setForegroundColor(gRGB(0,0,0));
+					painter.renderText(shadow, element.m_line2, gPainter::RT_VALIGN_CENTER|gPainter::RT_HALIGN_CENTER);
+					painter.setForegroundColor(gRGB(255,255,255));
+					painter.renderText(area, element.m_line2, gPainter::RT_VALIGN_CENTER|gPainter::RT_HALIGN_CENTER);
+				}
+				if (didMove)
+				{
+					// Must move area and shadow back, otherwise text will jump one line down if showing and hiding infobar before the next subtitle page arrives
+					shadow.moveBy(0, -1*lineHeight);
+					area.moveBy(0, -1*lineHeight);
+					didMove = false;
+				}
 			}
 		}
 		else if (m_pango_page_ok)
 		{
 			int elements = m_pango_page.m_elements.size();
-			ePtr<gFont> font = new gFont("Regular", 38);
+			ePtr<gFont> font = new gFont("Regular", fontSize);
 			for (int i=0; i<elements; ++i)
 			{
 				ePangoSubtitlePageElement &element = m_pango_page.m_elements[i];
@@ -160,11 +197,11 @@ int eSubtitleWidget::event(int event, void *data, void *data2)
 					{
 					case 'i':
 						eDebug("found italic");
-						font = new gFont("LCD", 40);
+						font = new gFont("LCD", fontSize + 2);
 						break;
 					case 'b':
 						eDebug("found bold");
-						font = new gFont("Replacement", 40);
+						font = new gFont("Replacement", fontSize + 2);
 						break;
 					default:
 						break;
@@ -180,7 +217,7 @@ int eSubtitleWidget::event(int event, void *data, void *data2)
 				shadow.moveBy(3,3);
 				painter.setForegroundColor(gRGB(0,0,0));
 				painter.renderText(shadow, text, gPainter::RT_WRAP|gPainter::RT_VALIGN_CENTER|gPainter::RT_HALIGN_CENTER);
-				painter.setForegroundColor(element.m_color);
+				painter.setForegroundColor(gRGB(255,255,255));
 				painter.renderText(area, text, gPainter::RT_WRAP|gPainter::RT_VALIGN_CENTER|gPainter::RT_HALIGN_CENTER);
 			}
 		}
diff --git a/lib/gui/esubtitle.h b/lib/gui/esubtitle.h
index 0a780ca..7d36ca5 100644
--- a/lib/gui/esubtitle.h
+++ b/lib/gui/esubtitle.h
@@ -44,6 +44,8 @@ protected:
 
 private:
 	int m_page_ok;
+	int fontSize;
+	int lineHeight;
 	eDVBTeletextSubtitlePage m_page;
 
 	int m_dvb_page_ok;
diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index 45a12ce..ca8b8f9 100644
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -20,6 +20,12 @@
 
 		/* for subtitles */
 #include <lib/gui/esubtitle.h>
+#include <lib/gdi/epoint.h>
+#ifdef WITH_SDL
+#include <lib/gdi/sdl.h>
+#endif
+#include <lib/gdi/gfbdc.h>
+
 
 #include <sys/vfs.h>
 #include <sys/stat.h>
@@ -1968,6 +1974,35 @@ PyObject *eDVBServiceBase::getAll(bool original)
 	return ret;
 }
 
+ePoint eDVBServicePlay::getDvbSubtitlesMover()
+{
+	//if (!dvbSubtitlesMover)
+	//{
+#ifdef WITH_SDL
+		ePtr<gSDLDC> my_dc;
+		gSDLDC::getInstance(my_dc);
+#else
+		ePtr<gFBDC> my_dc;
+		gFBDC::getInstance(my_dc);
+#endif
+		int vRes = my_dc->getVerticalResolution();
+		int hRes = my_dc->getHorizontalResolution();
+		int marginLeft = (int)(hRes / 2 - 720 / 2);
+		if (marginLeft < 0) // Just to be sure...
+		{
+			marginLeft = 0;
+		}
+		int marginTop = 0;
+		if (vRes > 576)
+		{
+			marginTop = (int)(vRes/2 - 576 / 2);
+		}
+		eDebug("servicedvb.cpp: vRes = %i, hRes = %i, marginLeft = %i, marginTop = %i", vRes, hRes, marginLeft, marginTop);
+		dvbSubtitlesMover = ePoint(marginLeft, marginTop);
+	//}
+	return dvbSubtitlesMover;
+}
+
 int eDVBServicePlay::getNumberOfSubservices()
 {
 	ePtr<eServiceEvent> evt;
@@ -2636,6 +2671,7 @@ RESULT eDVBServicePlay::enableSubtitles(eWidget *parent, ePyObject tuple)
 
 		m_subtitle_widget = new eSubtitleWidget(parent);
 		m_subtitle_widget->resize(parent->size()); /* full size */
+		m_subtitle_widget->move(getDvbSubtitlesMover()); // Center 720x576 subtitles in HD skins. TODO: Scale DVB subtitles.
 		m_subtitle_parser->start(pid, composition_page_id, ancillary_page_id);
 		if (m_dvb_service)
 			m_dvb_service->setCacheEntry(eDVBService::cSUBTITLE, ((pid&0xFFFF)<<16)|((composition_page_id&0xFF)<<8)|(ancillary_page_id&0xFF));
diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h
index 43e4690..9e3c6a6 100644
--- a/lib/service/servicedvb.h
+++ b/lib/service/servicedvb.h
@@ -10,6 +10,7 @@
 #include <lib/dvb/teletext.h>
 #include <lib/dvb/radiotext.h>
 #include <lib/base/filepush.h>
+#include <lib/gdi/epoint.h>
 
 class eStaticServiceDVBInformation;
 class eStaticServiceDVBBouquetInformation;
@@ -182,6 +183,8 @@ public:
 		// iStreamableService
 	RESULT stream(ePtr<iStreamableService> &ptr);
 	PyObject *getStreamingData();
+
+	ePoint getDvbSubtitlesMover();
 private:
 	friend class eServiceFactoryDVB;
 	eServiceReference m_reference;
@@ -272,6 +275,7 @@ private:
 	void newDVBSubtitlePage(const eDVBSubtitlePage &p);
 	ePtr<eConnection> m_new_dvb_subtitle_page_connection;
 	std::list<eDVBSubtitlePage> m_dvb_subtitle_pages;
+	ePoint dvbSubtitlesMover;
 
 	ePtr<eTimer> m_subtitle_sync_timer;
 	void checkSubtitleTiming();