diff --git a/gpxsee.qrc b/gpxsee.qrc
index fd883090..1c08bde5 100644
--- a/gpxsee.qrc
+++ b/gpxsee.qrc
@@ -43,6 +43,7 @@
 		<file alias="casino-11.svg">icons/map/POI/casino-11.svg</file>
 		<file alias="castle-11.svg">icons/map/POI/castle-11.svg</file>
 		<file alias="cemetery-11.svg">icons/map/POI/cemetery-11.svg</file>
+		<file alias="charging-station-11.svg">icons/map/POI/charging-station-11.svg</file>
 		<file alias="cinema-11.svg">icons/map/POI/cinema-11.svg</file>
 		<file alias="clothing-store-11.svg">icons/map/POI/clothing-store-11.svg</file>
 		<file alias="college-11.svg">icons/map/POI/college-11.svg</file>
diff --git a/icons/map/POI/charging-station-11.svg b/icons/map/POI/charging-station-11.svg
new file mode 100644
index 00000000..9727f704
--- /dev/null
+++ b/icons/map/POI/charging-station-11.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="charging-station-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
+  <path d="M9.5,3H9V1.5C9,1.2239,8.7761,1,8.5,1S8,1.2239,8,1.5V3c0,0.5523,0.4477,1,1,1v4.25C9,8.3881,8.8881,8.5,8.75,8.5&#xA;&#x9;S8.5,8.3881,8.5,8.25V6.5C8.5,5.6716,7.8284,5,7,5V2c0-0.5523-0.4477-1-1-1H2C1.4477,1,1,1.4477,1,2v7c0,0.5523,0.4477,1,1,1h4&#xA;&#x9;c0.5523,0,1-0.4477,1-1V6c0.2761,0,0.5,0.2239,0.5,0.5v1.75c0,0.6904,0.5596,1.25,1.25,1.25S10,8.9404,10,8.25V3.5&#xA;&#x9;C10,3.2239,9.7761,3,9.5,3z M3.5,8.75H3L4,6H1.75L4.5,2.25H5L4,5h2.25L3.5,8.75z"/>
+</svg>
\ No newline at end of file
diff --git a/src/map/ENC/attributes.h b/src/map/ENC/attributes.h
index 167a0ad5..aec2d38a 100644
--- a/src/map/ENC/attributes.h
+++ b/src/map/ENC/attributes.h
@@ -43,6 +43,7 @@
 #define I_RDOCAL 17017
 #define I_WTWDIS 17064
 #define I_CATBRT 17066
+#define I_CATBUN 17067
 #define I_HUNITS 17103
 
 #endif // ENC_ATTRIBUTES_H
diff --git a/src/map/ENC/mapdata.cpp b/src/map/ENC/mapdata.cpp
index c4d2e3b2..9e6385d0 100644
--- a/src/map/ENC/mapdata.cpp
+++ b/src/map/ENC/mapdata.cpp
@@ -81,9 +81,10 @@ static QMap<uint,uint> orderMapInit()
 	map.insert(TYPE(SLCONS), 40);
 	map.insert(TYPE(LNDMRK), 41);
 	map.insert(TYPE(SILTNK), 42);
-	map.insert(TYPE(LNDELV), 43);
-	map.insert(TYPE(SMCFAC), 44);
-	map.insert(TYPE(BUISGL), 45);
+	map.insert(TYPE(I_BUNSTA), 43);
+	map.insert(TYPE(LNDELV), 44);
+	map.insert(TYPE(SMCFAC), 45);
+	map.insert(TYPE(BUISGL), 46);
 
 	map.insert(TYPE(I_DISMAR), 0xFFFFFFFE);
 	map.insert(TYPE(SOUNDG), 0xFFFFFFFF);
@@ -373,6 +374,8 @@ MapData::Point::Point(uint type, const Coordinates &c, const Attributes &attr,
 		subtype = I_CATACH;
 	else if (type == MARKUL)
 		subtype = CATMFA;
+	else if (type == I_BUNSTA)
+		subtype = I_CATBUN;
 
 	QList<QByteArray> list(_attr.value(subtype).split(','));
 	std::sort(list.begin(), list.end());
diff --git a/src/map/ENC/objects.h b/src/map/ENC/objects.h
index 8f1aa498..2fa3568c 100644
--- a/src/map/ENC/objects.h
+++ b/src/map/ENC/objects.h
@@ -122,6 +122,7 @@
 #define I_GATCON 17031
 #define I_SLCONS 17032
 #define I_WTWAXS 17051
+#define I_BUNSTA 17054
 #define I_TERMNL 17064
 #define I_TRNBSN 17065
 #define I_WTWGAG 17067
diff --git a/src/map/ENC/style.cpp b/src/map/ENC/style.cpp
index 8a9fe2f2..4fc6323a 100644
--- a/src/map/ENC/style.cpp
+++ b/src/map/ENC/style.cpp
@@ -435,6 +435,13 @@ void Style::pointStyle(qreal ratio)
 	_points[SUBTYPE(I_RESARE, 22)] = _points[SUBTYPE(RESARE, 22)];
 	_points[SUBTYPE(I_RESARE, 23)] = _points[SUBTYPE(RESARE, 23)];
 
+	_points[SUBTYPE(I_BUNSTA, 1)] = Point(svg2img(":/POI/fuel-11.svg", ratio),
+	  Small);
+	_points[SUBTYPE(I_BUNSTA, 2)] = Point(svg2img(":/POI/drinking-water-11.svg",
+	  ratio), Small);
+	_points[SUBTYPE(I_BUNSTA, 4)] = Point(svg2img(":/POI/charging-station-11.svg",
+	  ratio), Small);
+
 	_points[SUBTYPE(SMCFAC, 7)] = Point(svg2img(":/POI/restaurant-11.svg",
 	  ratio), Small);
 	_points[SUBTYPE(SMCFAC, 11)] = Point(svg2img(":/POI/pharmacy-11.svg",
@@ -443,6 +450,8 @@ void Style::pointStyle(qreal ratio)
 	  ratio), Small);
 	_points[SUBTYPE(SMCFAC, 13)] = Point(svg2img(":/POI/fuel-11.svg", ratio),
 	  Small);
+	_points[SUBTYPE(SMCFAC, 14)] = Point(svg2img(":/POI/charging-station-11.svg",
+	  ratio), Small);
 	_points[SUBTYPE(SMCFAC, 18)] = Point(svg2img(":/POI/toilet-11.svg", ratio),
 	  Small);
 	_points[SUBTYPE(SMCFAC, 20)] = Point(svg2img(":/POI/telephone-11.svg",