diff --git a/resources/data/defaultpresets.xml b/resources/data/defaultpresets.xml
index 6d9592a71..9e933a4b7 100644
--- a/resources/data/defaultpresets.xml
+++ b/resources/data/defaultpresets.xml
@@ -5024,8 +5024,8 @@
             <text key="ref" text="Reference" />
             <reference ref="operator_substance" />
             <combo key="location" text="Location" values="underground,underwater,overground" values_context="pipeline" />
-            <combo key="diameter" text="Diameter (mm)" values="800,1000,1200,1500,1600,1800,2200,2300,2400,2500,2600,2800,3200,3300,3400,3500,4000,4200,4300,4800" />
-            <text key="pressure" text="Pressure (bar)" />
+            <combo key="diameter" text="Diameter" suffix="mm" values="800,1000" />
+            <text key="pressure" text="Pressure" suffix="bar" />
         </item> <!-- Pipeline -->
         <item name="Pipeline Valve" icon="presets/misc/valve.svg" type="node" preset_name_label="true">
             <link wiki="Tag:pipeline=valve" />
diff --git a/resources/data/tagging-preset.xsd b/resources/data/tagging-preset.xsd
index 006aa9841..d4db3f96d 100644
--- a/resources/data/tagging-preset.xsd
+++ b/resources/data/tagging-preset.xsd
@@ -173,6 +173,7 @@
         <attribute name="key" type="string" use="required" />
         <attribute name="text" type="string" />
         <attribute name="text_context" type="string" />
+        <attribute name="suffix" type="string" />
         <attribute name="default" type="string" />
         <attribute name="use_last_as_default" type="tns:last_default" />
         <attribute name="auto_increment" type="string" />
@@ -205,6 +206,7 @@
         <attribute name="key" type="string" use="required" />
         <attribute name="text" type="string" />
         <attribute name="text_context" type="string" />
+        <attribute name="suffix" type="string" />
         <attribute name="values" type="string" />
         <attribute name="values_from" type="string" />
         <attribute name="values_context" type="string" />
diff --git a/src/org/openstreetmap/josm/gui/tagging/presets/items/Combo.java b/src/org/openstreetmap/josm/gui/tagging/presets/items/Combo.java
index 2c4ca7a24..520faa7ae 100644
--- a/src/org/openstreetmap/josm/gui/tagging/presets/items/Combo.java
+++ b/src/org/openstreetmap/josm/gui/tagging/presets/items/Combo.java
@@ -10,6 +10,7 @@
 import javax.swing.AbstractAction;
 import javax.swing.JButton;
 import javax.swing.JColorChooser;
+import javax.swing.JLabel;
 import javax.swing.JPanel;
 
 import org.openstreetmap.josm.data.tagging.ac.AutoCompletionPriority;
@@ -34,6 +35,8 @@
     /** The length of the combo box (number of characters allowed). */
     public short length; // NOSONAR
 
+    public String suffix;
+
     protected JosmComboBox<PresetListEntry> combobox;
 
     /**
@@ -107,6 +110,9 @@ protected void addToPanelAnchor(JPanel p, String def, boolean presetInitiallyMat
             ActionListener updateColor = ignore -> button.setBackground(getColor());
             updateColor.actionPerformed(null);
             combobox.addActionListener(updateColor);
+        } else if (suffix != null) {
+            p.add(combobox, GBC.std().fill(GBC.HORIZONTAL));
+            p.add(new JLabel(suffix), GBC.eol().insets(3, 0, 0, 0));
         } else {
             p.add(combobox, GBC.eol().fill(GBC.HORIZONTAL));
         }
diff --git a/src/org/openstreetmap/josm/gui/tagging/presets/items/Text.java b/src/org/openstreetmap/josm/gui/tagging/presets/items/Text.java
index 143c21ea5..59d7e9327 100644
--- a/src/org/openstreetmap/josm/gui/tagging/presets/items/Text.java
+++ b/src/org/openstreetmap/josm/gui/tagging/presets/items/Text.java
@@ -57,6 +57,8 @@
     /** A comma separated list of alternative keys to use for autocompletion. */
     public String alternative_autocomplete_keys; // NOSONAR
 
+    public String suffix;
+
     private JComponent value;
 
     @Override
@@ -168,7 +170,12 @@ public boolean addToPanel(JPanel p, Collection<OsmPrimitive> sel, boolean preset
         label.setComponentPopupMenu(getPopupMenu());
         label.setLabelFor(value);
         p.add(label, GBC.std().insets(0, 0, 10, 0));
-        p.add(value, GBC.eol().fill(GBC.HORIZONTAL));
+        if (suffix != null) {
+            p.add(value, GBC.std().fill(GBC.HORIZONTAL));
+            p.add(new JLabel(suffix), GBC.eol().insets(3, 0, 0, 0));
+        } else {
+            p.add(value, GBC.eol().fill(GBC.HORIZONTAL));
+        }
         value.setToolTipText(getKeyTooltipText());
         return true;
     }