Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLights.java
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLights.java	(revision 27441)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLights.java	(revision 27442)
@@ -133,4 +133,5 @@
 			platformCatBox.setVisible(false);
 			pilotCatBox.setVisible(false);
+			rescueCatBox.setVisible(false);
 			dlg.panelMain.mark.setCategory(Cat.NOCAT);
 			if (landButton.isSelected()) {
@@ -154,4 +155,8 @@
 				pilotCatBox.setVisible(true);
 				alPilotCatBox.actionPerformed(null);
+			} else if (rescueButton.isSelected()) {
+				categoryLabel.setVisible(true);
+				rescueCatBox.setVisible(true);
+				alRescueCatBox.actionPerformed(null);
 			}
 			dlg.panelMain.mark.testValid();
@@ -273,4 +278,12 @@
 		addPTItem(Messages.getString("FromShore"), Cat.PIL_SHORE);
 		pilotCatBox.setVisible(false);
+
+		rescueCatBox = new JComboBox();
+		rescueCatBox.setBounds(new Rectangle(5, 130, 160, 20));
+		add(rescueCatBox);
+		rescueCatBox.addActionListener(alRescueCatBox);
+		addRSItem("", Cat.NOCAT);
+		addRSItem(Messages.getString("Lifeboat"), Cat.RSC_LFB);
+		rescueCatBox.setVisible(false);
 	}
 
@@ -282,4 +295,5 @@
 		platformCatBox.setVisible(false);
 		pilotCatBox.setVisible(false);
+		rescueCatBox.setVisible(false);
 		if ((dlg.panelMain.mark.getObject() == Obj.LNDMRK) && (dlg.panelMain.mark.getCategory() != Cat.NOCAT)) {
 			categoryLabel.setVisible(true);
@@ -322,5 +336,12 @@
 					pilotCatBox.setSelectedIndex(item);
 			}
-		} else {
+		} else if (dlg.panelMain.mark.getObject() == Obj.RSCSTA) {
+			categoryLabel.setVisible(true);
+			rescueCatBox.setVisible(true);
+			for (Cat cat : rescueCats.keySet()) {
+				int item = rescueCats.get(cat);
+				if (dlg.panelMain.mark.getCategory() == cat)
+					rescueCatBox.setSelectedIndex(item);
+			}
 		}
 		for (Obj obj : objects.keySet()) {
@@ -354,4 +375,9 @@
 		pilotCats.put(cat, pilotCatBox.getItemCount());
 		pilotCatBox.addItem(str);
+	}
+
+	private void addRSItem(String str, Cat cat) {
+		rescueCats.put(cat, rescueCatBox.getItemCount());
+		rescueCatBox.addItem(str);
 	}
 
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java	(revision 27441)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java	(revision 27442)
@@ -311,8 +311,6 @@
 				break;
 			case LGT:
-			case SIS:
+			case STN:
 			case PLF:
-			case CGS:
-			case PLT:
 				lightsButton.setBorderPainted(true);
 				panelLights.setVisible(true);
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/SeaMark.java
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/SeaMark.java	(revision 27441)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/SeaMark.java	(revision 27442)
@@ -137,6 +137,5 @@
 
 	public enum Ent {
-		BODY, BUOY, BEACON, LFLOAT, TOPMARK, LIGHT, MOORING, STATION, PLATFORM,
-		COASTGUARD, PILOT
+		BODY, BUOY, BEACON, LFLOAT, TOPMARK, LIGHT, MOORING, STATION, PLATFORM
 	}
 
@@ -169,10 +168,11 @@
 		EntMAP.put(Obj.SISTAW, Ent.STATION);
 		EntMAP.put(Obj.SISTAT, Ent.STATION);
-		EntMAP.put(Obj.CGUSTA, Ent.COASTGUARD);
-		EntMAP.put(Obj.PILBOP, Ent.PILOT);
+		EntMAP.put(Obj.CGUSTA, Ent.STATION);
+		EntMAP.put(Obj.PILBOP, Ent.STATION);
+		EntMAP.put(Obj.RSCSTA, Ent.STATION);
 	}
 
 	public enum Grp {
-		NUL, LAT, CAR, SAW, ISD, SPP, LGT, SIS, PLF, CGS, PLT
+		NUL, LAT, CAR, SAW, ISD, SPP, LGT, STN, PLF
 	}
 
@@ -204,8 +204,9 @@
 		GrpMAP.put(Obj.BOYINB, Grp.SPP);
 		GrpMAP.put(Obj.OFSPLF, Grp.PLF);
-		GrpMAP.put(Obj.SISTAW, Grp.SIS);
-		GrpMAP.put(Obj.SISTAT, Grp.SIS);
-		GrpMAP.put(Obj.CGUSTA, Grp.CGS);
-		GrpMAP.put(Obj.PILBOP, Grp.PLT);
+		GrpMAP.put(Obj.SISTAW, Grp.STN);
+		GrpMAP.put(Obj.SISTAT, Grp.STN);
+		GrpMAP.put(Obj.CGUSTA, Grp.STN);
+		GrpMAP.put(Obj.PILBOP, Grp.STN);
+		GrpMAP.put(Obj.RSCSTA, Grp.STN);
 	}
 
@@ -222,7 +223,7 @@
 		LMK_MAST, LMK_WNDS, LMK_CLMN, LMK_OBLK, LMK_STAT, LMK_CROS, LMK_DOME, LMK_SCNR, LMK_WNDL, LMK_SPIR,
 		OFP_OIL, OFP_PRD, OFP_OBS, OFP_ALP, OFP_SALM, OFP_MOR, OFP_ISL, OFP_FPSO, OFP_ACC, OFP_NCCB,
-		PIL_VESS, PIL_HELI, PIL_SHORE
-	}
-
+		PIL_VESS, PIL_HELI, PIL_SHORE, RSC_LFB, RSC_RKT, RSC_RSW, RSC_RIT, RSC_MLB, RSC_RAD, RSC_FAE, RSC_SPL, RSC_AIR, RSC_TUG
+	}
+		 
 	public static final EnumMap<Cat, String> CatSTR = new EnumMap<Cat, String>(Cat.class);
 	static {
@@ -320,4 +321,14 @@
 		CatSTR.put(Cat.PIL_HELI, "helicopter");
 		CatSTR.put(Cat.PIL_SHORE, "from_shore");
+		CatSTR.put(Cat.RSC_LFB, "lifeboat");
+		CatSTR.put(Cat.RSC_RKT, "rocket");
+		CatSTR.put(Cat.RSC_RSW, "refuge_shipwrecked");
+		CatSTR.put(Cat.RSC_RIT, "refuge_intertidal");
+		CatSTR.put(Cat.RSC_MLB, "lifeboat_moored");
+		CatSTR.put(Cat.RSC_RAD, "radio");
+		CatSTR.put(Cat.RSC_FAE, "firstaid");
+		CatSTR.put(Cat.RSC_SPL, "seaplane");
+		CatSTR.put(Cat.RSC_AIR, "aircraft");
+		CatSTR.put(Cat.RSC_TUG, "tug");
 	}
 
@@ -1157,4 +1168,5 @@
 		case BOYINB:
 		case PILBOP:
+		case RSCSTA:
  			tmp = true;
 			break;
@@ -1943,4 +1955,7 @@
 			case PILBOP:
 				imgStr += "Pilot";
+				break;
+			case RSCSTA:
+				imgStr += "Rescue";
 				break;
 			}