diff --git a/lib/operating_system.rb b/lib/operating_system.rb
index 33d70c8..4d0d85d 100644
--- a/lib/operating_system.rb
+++ b/lib/operating_system.rb
@@ -4,5 +4,7 @@ class OperatingSystem < ActiveRecord::Base
   belongs_to :software_info
   belongs_to :operating_system_name
 
+  validates_length_of :version, maximum: 20, too_long: _("Operating system is too long (maximum is 20 characters)")
+
   validates :version, :operating_system_name, :presence=>true
 end
\ No newline at end of file
diff --git a/test/unit/operating_system_validation_test.rb b/test/unit/operating_system_validation_test.rb
index 217f7c9..11058fa 100644
--- a/test/unit/operating_system_validation_test.rb
+++ b/test/unit/operating_system_validation_test.rb
@@ -23,4 +23,9 @@ class OperatingSystemValidationTest < ActiveSupport::TestCase
    assert !@operating_system.save
   end
 
+  should "not save if OperatingSystem have a version too long" do
+    @operating_system.version = "A too long version to be a valid operating system version"
+    assert !@operating_system.save
+  end
+
 end
--
libgit2 0.21.2