diff --git a/gpxsee.qrc b/gpxsee.qrc
index d24494c6..65ac91d9 100644
--- a/gpxsee.qrc
+++ b/gpxsee.qrc
@@ -14,5 +14,6 @@
         <file>icons/arrow-left-double.png</file>
         <file>icons/arrow-right-double.png</file>
         <file>lang/gpxsee_cs.qm</file>
+        <file>maps.txt</file>
     </qresource>
 </RCC>
diff --git a/maps.txt b/maps.txt
new file mode 100644
index 00000000..8479bbd2
--- /dev/null
+++ b/maps.txt
@@ -0,0 +1,2 @@
+OSM	http://tile.openstreetmap.org/$z/$x/$y.png
+Thunderforest	http://tile.thunderforest.com/outdoors/$z/$x/$y.png
diff --git a/src/gui.cpp b/src/gui.cpp
index 795eca01..7f70608b 100644
--- a/src/gui.cpp
+++ b/src/gui.cpp
@@ -75,6 +75,7 @@ void GUI::loadFiles()
 {
 	// Maps
 	_maps = MapList::load(QString("%1/"MAP_LIST_FILE).arg(QDir::homePath()));
+	_maps += MapList::load(":/maps.txt");
 
 	// POI files
 	QDir dir(QString("%1/"POI_DIR).arg(QDir::homePath()));
@@ -181,8 +182,10 @@ void GUI::createActions()
 	connect(_showMapAction, SIGNAL(triggered(bool)), this, SLOT(showMap(bool)));
 	if (_maps.empty())
 		_showMapAction->setEnabled(false);
-	else
+	else {
 		createMapActions();
+		_showMapAction->setChecked(true);
+	}
 
 	// Settings actions
 	_showGraphsAction = new QAction(tr("Show graphs"), this);
@@ -299,6 +302,9 @@ void GUI::createToolBars()
 void GUI::createTrackView()
 {
 	_track = new Track(this);
+
+	if (_showMapAction->isChecked())
+		_track->setMap(_currentMap);
 }
 
 void GUI::createTrackGraphs()