diff --git a/qt-ui/configuredivecomputerdialog.cpp b/qt-ui/configuredivecomputerdialog.cpp
index cfc1b8d54..39ec9fbc2 100644
--- a/qt-ui/configuredivecomputerdialog.cpp
+++ b/qt-ui/configuredivecomputerdialog.cpp
@@ -462,6 +462,13 @@ void ConfigureDiveComputerDialog::on_DiveComputerList_currentRowChanged(int curr
 		selected_vendor = "Heinrichs Weikamp";
 		selected_product = "OSTC 3";
 		break;
+	case 1:
+		selected_vendor = "Suunto";
+		selected_product = "Vyper";
+		break;
+	default:
+		/* Not Supported */
+		return;
 	}
 
 	int dcType = DC_TYPE_SERIAL;
diff --git a/qt-ui/configuredivecomputerdialog.ui b/qt-ui/configuredivecomputerdialog.ui
index 2a2d89bed..94390e9e7 100644
--- a/qt-ui/configuredivecomputerdialog.ui
+++ b/qt-ui/configuredivecomputerdialog.ui
@@ -17,7 +17,7 @@
    <item>
     <layout class="QVBoxLayout" name="verticalLayout">
      <item>
-      <widget class="QLabel" name="label_3">
+      <widget class="QLabel" name="label_1">
        <property name="text">
         <string>Device or mount point</string>
        </property>
@@ -160,12 +160,20 @@
          <normaloff>:/icons/ostc3.png</normaloff>:/icons/ostc3.png</iconset>
        </property>
       </item>
+      <item>
+       <property name="text">
+        <string>Suunto Vyper Family</string>
+       </property>
+      </item>
      </widget>
      <widget class="QStackedWidget" name="dcStackedWidget">
-      <widget class="QWidget" name="page_2">
+      <property name="currentIndex">
+       <number>1</number>
+      </property>
+      <widget class="QWidget" name="page_ostc3">
        <layout class="QVBoxLayout" name="verticalLayout_3">
         <item>
-         <widget class="QTabWidget" name="tabWidget">
+         <widget class="QTabWidget" name="tabWidget1">
           <property name="currentIndex">
            <number>0</number>
           </property>
@@ -175,7 +183,7 @@
            </attribute>
            <layout class="QGridLayout" name="gridLayout">
             <item row="0" column="0">
-             <widget class="QLabel" name="label_7">
+             <widget class="QLabel" name="label_2">
               <property name="text">
                <string>Serial No.</string>
               </property>
@@ -186,13 +194,19 @@
             </item>
             <item row="0" column="1" colspan="2">
              <widget class="QLineEdit" name="serialNoLineEdit">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                <horstretch>1</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
               <property name="readOnly">
                <bool>true</bool>
               </property>
              </widget>
             </item>
             <item row="0" column="3">
-             <widget class="QLabel" name="label_8">
+             <widget class="QLabel" name="label_3">
               <property name="text">
                <string>Firmware version</string>
               </property>
@@ -209,7 +223,7 @@
              </widget>
             </item>
             <item row="1" column="0">
-             <widget class="QLabel" name="label_5">
+             <widget class="QLabel" name="label_4">
               <property name="text">
                <string>Custom text</string>
               </property>
@@ -229,7 +243,7 @@
              </widget>
             </item>
             <item row="1" column="3">
-             <widget class="QLabel" name="label_6">
+             <widget class="QLabel" name="label_5">
               <property name="text">
                <string>Language</string>
               </property>
@@ -297,7 +311,7 @@
              </widget>
             </item>
             <item row="2" column="3">
-             <widget class="QLabel" name="label_9">
+             <widget class="QLabel" name="label_6">
               <property name="text">
                <string>Date format</string>
               </property>
@@ -326,7 +340,7 @@
              </widget>
             </item>
             <item row="3" column="0">
-             <widget class="QLabel" name="label_2">
+             <widget class="QLabel" name="label_7">
               <property name="text">
                <string>Saturation</string>
               </property>
@@ -343,7 +357,7 @@
              </widget>
             </item>
             <item row="3" column="3">
-             <widget class="QLabel" name="label_16">
+             <widget class="QLabel" name="label_8">
               <property name="text">
                <string>Desaturation</string>
               </property>
@@ -360,7 +374,7 @@
              </widget>
             </item>
             <item row="4" column="0">
-             <widget class="QLabel" name="label_10">
+             <widget class="QLabel" name="label_9">
               <property name="text">
                <string>Last deco</string>
               </property>
@@ -377,7 +391,7 @@
              </widget>
             </item>
             <item row="4" column="3">
-             <widget class="QLabel" name="label_4">
+             <widget class="QLabel" name="label_10">
               <property name="text">
                <string>Brightness</string>
               </property>
@@ -406,7 +420,7 @@
              </widget>
             </item>
             <item row="5" column="0">
-             <widget class="QLabel" name="label_12">
+             <widget class="QLabel" name="label_11">
               <property name="text">
                <string>Sampling rate</string>
               </property>
@@ -430,7 +444,7 @@
              </widget>
             </item>
             <item row="5" column="3">
-             <widget class="QLabel" name="label_11">
+             <widget class="QLabel" name="label_12">
               <property name="text">
                <string>Units</string>
               </property>
@@ -454,7 +468,7 @@
              </widget>
             </item>
             <item row="6" column="0">
-             <widget class="QLabel" name="label_14">
+             <widget class="QLabel" name="label_13">
               <property name="text">
                <string>Dive mode color</string>
               </property>
@@ -488,7 +502,7 @@
              </widget>
             </item>
             <item row="6" column="3">
-             <widget class="QLabel" name="label_13">
+             <widget class="QLabel" name="label_14">
               <property name="text">
                <string>Salinity (0-5%)</string>
               </property>
@@ -593,7 +607,7 @@
            <attribute name="title">
             <string>Gas settings</string>
            </attribute>
-           <layout class="QGridLayout" name="gridLayout_2">
+           <layout class="QGridLayout" name="gridLayout_1">
             <item row="0" column="0">
              <widget class="QTableWidget" name="ostc3GasTable">
               <property name="sizePolicy">
@@ -845,6 +859,382 @@
         </item>
        </layout>
       </widget>
+      <widget class="QWidget" name="page_vyper">
+       <layout class="QVBoxLayout">
+        <item>
+         <widget class="QTabWidget" name="tabWidget2">
+          <property name="currentIndex">
+           <number>0</number>
+          </property>
+          <widget class="QWidget" name="basic_settings">
+           <attribute name="title">
+            <string>Basic settings</string>
+           </attribute>
+           <layout class="QGridLayout" name="gridLayout_2">
+            <item row="1" column="1" colspan="2">
+             <widget class="QDoubleSpinBox" name="maxDepthDoubleSpinBox">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                <horstretch>1</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="readOnly">
+               <bool>true</bool>
+              </property>
+              <property name="maximum">
+               <number>200</number>
+              </property>
+             </widget>
+            </item>
+            <item row="6" column="0">
+             <widget class="QLabel" name="label_21">
+              <property name="text">
+               <string>Safety level</string>
+              </property>
+             </widget>
+            </item>
+            <item row="5" column="1">
+             <widget class="QComboBox" name="altitudeRangeComboBox">
+              <item>
+               <property name="text">
+                <string notr="true">A0 (0m - 300m)</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string notr="true">A1 (300m - 1500m)</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string notr="true">A2 (1500m - 3000m)</string>
+               </property>
+              </item>
+             </widget>
+            </item>
+            <item row="5" column="0">
+             <widget class="QLabel" name="label_20">
+              <property name="text">
+               <string>Altitude range</string>
+              </property>
+             </widget>
+            </item>
+            <item row="9" column="0">
+             <widget class="QLabel" name="label_22">
+              <property name="text">
+               <string>Model</string>
+              </property>
+             </widget>
+            </item>
+            <item row="3" column="1" colspan="2">
+             <widget class="QLineEdit" name="customTextLlineEdit_1">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                <horstretch>1</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="maxLength">
+               <number>30</number>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="3">
+             <widget class="QLabel" name="label_16">
+              <property name="text">
+               <string>Number of dives</string>
+              </property>
+             </widget>
+            </item>
+            <item row="11" column="0">
+             <spacer name="verticalSpacer_2">
+              <property name="orientation">
+               <enum>Qt::Vertical</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>0</width>
+                <height>0</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item row="0" column="0">
+             <widget class="QLabel" name="label1">
+              <property name="text">
+               <string>Serial No.</string>
+              </property>
+              <property name="buddy">
+               <cstring>serialNoLineEdit_1</cstring>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="1" colspan="2">
+             <widget class="QLineEdit" name="serialNoLineEdit_1">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                <horstretch>1</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="readOnly">
+               <bool>true</bool>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="3">
+             <widget class="QLabel" name="label_17">
+              <property name="text">
+               <string>Firmware version</string>
+              </property>
+              <property name="buddy">
+               <cstring>firmwareVersionLineEdit_1</cstring>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="4">
+             <widget class="QLineEdit" name="firmwareVersionLineEdit_1">
+              <property name="readOnly">
+               <bool>true</bool>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="0">
+             <widget class="QLabel" name="label_18">
+              <property name="text">
+               <string>Max depth</string>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="4">
+             <widget class="QSpinBox" name="numberOfDivesSpinBox">
+              <property name="readOnly">
+               <bool>true</bool>
+              </property>
+              <property name="maximum">
+               <number>5000</number>
+              </property>
+             </widget>
+            </item>
+            <item row="3" column="0">
+             <widget class="QLabel" name="label_19">
+              <property name="text">
+               <string>Custom text</string>
+              </property>
+              <property name="buddy">
+               <cstring>customTextLlineEdit_1</cstring>
+              </property>
+             </widget>
+            </item>
+            <item row="9" column="1">
+             <widget class="QComboBox" name="diveModeComboBox_1">
+              <item>
+               <property name="text">
+                <string notr="true" extracomment="Suunto computer mode">Air</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string notr="true" extracomment="Suunto computer mode">Nitrox</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string notr="true" extracomment="Suunto computer mode">Gauge</string>
+               </property>
+              </item>
+             </widget>
+            </item>
+            <item row="6" column="1">
+             <widget class="QComboBox" name="personalSafetyComboBox">
+              <item>
+               <property name="text">
+                <string extracomment="Suunto safety level">P0 (none)</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string extracomment="Suunto safety level">P1 (some)</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string extracomment="Suunto safety level">P2 (much)</string>
+               </property>
+              </item>
+             </widget>
+            </item>
+            <item row="4" column="0">
+             <widget class="QLabel" name="label_23">
+              <property name="text">
+               <string>Sample rate</string>
+              </property>
+             </widget>
+            </item>
+            <item row="4" column="1">
+             <widget class="QComboBox" name="samplingRateComboBox_1">
+              <item>
+               <property name="text">
+                <string>10s</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>20s</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>30s</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>60s</string>
+               </property>
+              </item>
+             </widget>
+            </item>
+            <item row="2" column="0">
+             <widget class="QLabel" name="label_24">
+              <property name="text">
+               <string>Total divetime</string>
+              </property>
+             </widget>
+            </item>
+            <item row="2" column="3">
+             <widget class="QLabel" name="label_25">
+              <property name="text">
+               <string>Computer model</string>
+              </property>
+             </widget>
+            </item>
+            <item row="2" column="4">
+             <widget class="QLineEdit" name="modelLineEdit">
+              <property name="readOnly">
+               <bool>true</bool>
+              </property>
+             </widget>
+            </item>
+            <item row="2" column="1" colspan="2">
+             <widget class="QSpinBox" name="totalTimeSpinBox">
+              <property name="readOnly">
+               <bool>true</bool>
+              </property>
+              <property name="suffix">
+               <string>min</string>
+              </property>
+              <property name="minimum">
+               <number>0</number>
+              </property>
+              <property name="maximum">
+               <number>5000000</number>
+              </property>
+             </widget>
+            </item>
+            <item row="7" column="1">
+             <widget class="QComboBox" name="timeFormatComboBox">
+              <item>
+               <property name="text">
+                <string>24h</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>12h</string>
+               </property>
+              </item>
+             </widget>
+            </item>
+            <item row="7" column="0">
+             <widget class="QLabel" name="label_26">
+              <property name="text">
+               <string>Time format</string>
+              </property>
+             </widget>
+            </item>
+            <item row="8" column="0">
+             <widget class="QLabel" name="label_27">
+              <property name="text">
+               <string>Units</string>
+              </property>
+             </widget>
+            </item>
+            <item row="8" column="1">
+             <widget class="QComboBox" name="unitsComboBox_1">
+              <item>
+               <property name="text">
+                <string>Imperial</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>Metric</string>
+               </property>
+              </item>
+             </widget>
+            </item>
+            <item row="4" column="4">
+             <widget class="QSpinBox" name="lightSpinBox">
+              <property name="enabled">
+               <bool>false</bool>
+              </property>
+              <property name="suffix">
+               <string>s</string>
+              </property>
+             </widget>
+            </item>
+            <item row="4" column="3">
+             <widget class="QCheckBox" name="lightCheckBox">
+              <property name="text">
+               <string>Light</string>
+              </property>
+             </widget>
+            </item>
+            <item row="5" column="4">
+             <widget class="QDoubleSpinBox" name="alarmDepthDoubleSpinBox">
+              <property name="enabled">
+               <bool>false</bool>
+              </property>
+              <property name="maximum">
+               <double>200.000000000000000</double>
+              </property>
+             </widget>
+            </item>
+            <item row="5" column="3">
+             <widget class="QCheckBox" name="alarmDepthCheckBox">
+              <property name="text">
+               <string>Depth alarm</string>
+              </property>
+             </widget>
+            </item>
+            <item row="6" column="4">
+             <widget class="QSpinBox" name="alarmTimeSpinBox">
+              <property name="enabled">
+               <bool>false</bool>
+              </property>
+              <property name="suffix">
+               <string>min</string>
+              </property>
+              <property name="maximum">
+               <number>999</number>
+              </property>
+             </widget>
+            </item>
+            <item row="6" column="3">
+             <widget class="QCheckBox" name="alarmTimeCheckBox">
+              <property name="text">
+               <string>Time alarm</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </widget>
+         </widget>
+        </item>
+       </layout>
+      </widget>
      </widget>
     </widget>
    </item>
@@ -887,12 +1277,60 @@
    <slot>setCurrentIndex(int)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>258</x>
-     <y>130</y>
+     <x>20</x>
+     <y>20</y>
     </hint>
     <hint type="destinationlabel">
-     <x>292</x>
-     <y>118</y>
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>lightCheckBox</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>lightSpinBox</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>alarmDepthCheckBox</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>alarmDepthDoubleSpinBox</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>alarmTimeCheckBox</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>alarmTimeSpinBox</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>20</x>
+     <y>20</y>
     </hint>
    </hints>
   </connection>