Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 6491)
+++ trunk/data/defaultpresets.xml	(revision 6492)
@@ -5436,5 +5436,5 @@
             <text key="name" text="Name" />
         </item>
-        <item name="Surveillance" icon="presets/surveillance.png" type="node,closedway">
+        <item name="Surveillance Camera" icon="presets/surveillance.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:man_made=surveillance"
@@ -5444,6 +5444,19 @@
             <space />
             <key key="man_made" value="surveillance" />
-            <text key="name" text="Name" />
+            <key key="surveillance:type" value="camera" />
+            <text key="name" text="Name" />
+            <text key="operator" text="Operator" />
             <combo key="surveillance" text="Type" values="indoor,outdoor,public" />
+            <combo key="surveillance:zone" text="Zone" values="town,parking,traffic,shop,bank,building" />
+            <space />
+            <label text="Camera" />
+            <space />
+            <combo key="camera:type" text="Type" values="fixed,panning,dome" match="key" />
+            <combo key="camera:mount" text="Mounted on" values="wall,pole,ceiling" match="key" />
+            <optional>
+	            <text key="camera:direction" text="Direction in degrees" match="key" />
+	            <text key="camera:angle" text="Inclination in degrees" match="key" />
+                <text key="height" text="Height in meter (m)" />
+            </optional>
         </item>
     </group> <!-- Man Made -->