diff --git a/application/controllers/Attributes.php b/application/controllers/Attributes.php
index 270585eb0..2d0bc0591 100644
--- a/application/controllers/Attributes.php
+++ b/application/controllers/Attributes.php
@@ -71,6 +71,7 @@ class Attributes extends Secure_Controller
 		//Save definition data
 		$definition_data = array(
 			'definition_name' => $this->input->post('definition_name'),
+			'definition_unit' => $this->input->post('definition_unit') != '' ? $this->input->post('definition_unit') : NULL,
 			'definition_flags' => $definition_flags,
 			'definition_fk' => $this->input->post('definition_group') != '' ? $this->input->post('definition_group') : NULL
 		);
diff --git a/application/language/en-US/attributes_lang.php b/application/language/en-US/attributes_lang.php
index ad3619e4a..4ab513f23 100644
--- a/application/language/en-US/attributes_lang.php
+++ b/application/language/en-US/attributes_lang.php
@@ -14,6 +14,7 @@ $lang["attributes_definition_successful_deleted"] = "You have successfully delet
 $lang["attributes_definition_successful_updating"] = "You have successfully updated attribute";
 $lang["attributes_definition_type"] = "Attribute Type";
 $lang["attributes_definition_type_required"] = "Attribute type is a required field";
+$lang["attributes_definition_unit"] = "Measurement Unit";
 $lang["attributes_definition_values"] = "Attribute Values";
 $lang["attributes_definition_error_adding_updating"] = "Attribute %1 could not be added or updated. Please check the error log.";
 $lang["attributes_new"] = "New Attribute";
diff --git a/application/migrations/sqlscripts/3.4.0_decimal_attribute_type.sql b/application/migrations/sqlscripts/3.4.0_decimal_attribute_type.sql
index db87f1b72..56aa3763e 100644
--- a/application/migrations/sqlscripts/3.4.0_decimal_attribute_type.sql
+++ b/application/migrations/sqlscripts/3.4.0_decimal_attribute_type.sql
@@ -1,2 +1,5 @@
 ALTER TABLE ospos_attribute_values
 ADD COLUMN attribute_decimal DECIMAL(7,3) DEFAULT NULL AFTER attribute_datetime;
+
+ALTER TABLE ospos_attribute_definitions
+ADD COLUMN definition_unit VARCHAR(16) DEFAULT NULL AFTER definition_type;
\ No newline at end of file
diff --git a/application/views/attributes/form.php b/application/views/attributes/form.php
index b370ac9f2..33bc3977f 100644
--- a/application/views/attributes/form.php
+++ b/application/views/attributes/form.php
@@ -39,6 +39,15 @@
 		</div>
 	</div>
 
+	<div class="form-group form-group-sm hidden">
+		<?php echo form_label($this->lang->line('attributes_definition_unit'), 'definition_units', array('class' => 'control-label col-xs-3')); ?>
+		<div class='col-xs-8'>
+			<div class="input-group">
+				<?php echo form_input(array('name'=>'definition_unit', 'value'=>$definition_info->definition_unit,'class'=>'form-control input-sm', 'id' => 'definition_unit'));?>
+			</div>
+		</div>
+	</div>
+
 	<div class="form-group form-group-sm hidden">
 		<?php echo form_label($this->lang->line('attributes_definition_values'), 'definition_value', array('class' => 'control-label col-xs-3')); ?>
 		<div class='col-xs-8'>
@@ -93,9 +102,11 @@ $(document).ready(function()
 	var show_hide_fields = function(event)
 	{
 	    var is_dropdown = $('#definition_type').val() !== '1';
+	    var is_decimal = $('#definition_type').val() !== '2';
 	    var is_no_group = $('#definition_type').val() !== '0';
 
 		$('#definition_value, #definition_list_group').parents('.form-group').toggleClass('hidden', is_dropdown);
+		$('#definition_unit').parents('.form-group').toggleClass('hidden', is_decimal);
 		$('#definition_flags').parents('.form-group').toggleClass('hidden', !is_no_group);
 	};