diff --git a/CHANGELOG.md b/CHANGELOG.md
index c7b02941e..dafedfac4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 - Added verion info for Vyatta (@systeembeheerder)
 - model for Fibrestore (fs.com) FSOS (@tcrichton)
 - model for IP Infusion OcNOS
+- model for Fujitsu 1finity (@jerji)
 
 ### Changed
 - tp-link: fixed enable mode post login entrance (@mirackle-spb)
diff --git a/docs/Supported-OS-Types.md b/docs/Supported-OS-Types.md
index 23eb47cfd..450171312 100644
--- a/docs/Supported-OS-Types.md
+++ b/docs/Supported-OS-Types.md
@@ -94,6 +94,7 @@
 |FortiGate           |FortiOS                       |[fortios](/lib/oxidized/model/fortios.rb)        |                 |[FortiOS](Model-Notes/FortiOS.md)
 |FortiWLC            |FortiWLC                      |[fortiwlc](/lib/oxidized/model/fortiwlc.rb)
 |Fujitsu             |PRIMERGY Blade switch 1/10Gbe |[fujitsupy](/lib/oxidized/model/fujitsupy.rb)
+|                    |1FINITY Switches              |[onefinity](/lib/oxidized/model/onefinity.rb)
 |GCOM Technologies   |Broadband Network Platform Software|[gcombnps](/lib/oxidized/model/gcombnps.rb)
 |Grandstream Networks|GSX                           |[grandstream](/lib/oxidized/model/grandstream.rb)
 |Hatteras            |Hatteras                      |[hatteras](/lib/oxidized/model/hatteras.rb)
diff --git a/lib/oxidized/model/onefinity.rb b/lib/oxidized/model/onefinity.rb
new file mode 100644
index 000000000..aafa52d9e
--- /dev/null
+++ b/lib/oxidized/model/onefinity.rb
@@ -0,0 +1,18 @@
+class OneFinity < Oxidized::Model
+  using Refinements
+
+  # Fujitsu 1finity
+
+  prompt /(\r?[\w.@_()-]+[>]\s?)$/
+
+  cmd :all do |cfg|
+    cfg.each_line.to_a[1..-3].join
+  end
+
+  cmd 'show configuration | display set | nomore'
+
+  cfg :ssh do
+    pre_logout 'exit'
+    exec true
+  end
+end