diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index af9b7205d16..ed94d70c85b 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -468,6 +468,12 @@ if ($id > 0)
 		print '</div></td></tr>';
 	}
 
+	// Categories
+	print '<tr><td>' . $langs->trans( "Categories" ) . '</td>';
+	print '<td colspan="3">';
+	print $form->showCategories( $object->id, 'customer', 1 );
+	print "</td></tr>";
+
 	// Other attributes
 	$parameters=array('socid'=>$object->id, 'colspan' => ' colspan="3"', 'colspanvalue' => '3');
 	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 8b6dfa38657..7fae79d44a7 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -227,7 +227,7 @@ function dol_shutdown()
  *  @param	int		$method	     Type of method (0 = get then post, 1 = only get, 2 = only post, 3 = post then get, 4 = post then get then cookie)
  *  @param  int     $filter      Filter to apply when $check is set to custom. (See http://php.net/manual/en/filter.filters.php for détails)
  *  @param  mixed   $options     Options to pass to filter_var when $check is set to custom
- *  @return string||string[]     Value found (string or array), or '' if check fails
+ *  @return string|string[]      Value found (string or array), or '' if check fails
  */
 function GETPOST($paramname,$check='',$method=0,$filter=NULL,$options=NULL)
 {
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index b26e6766a4e..57ade3645b1 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -40,6 +40,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
 if (! empty($conf->adherent->enabled)) require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 
 $langs->load("companies");
@@ -396,6 +397,16 @@ if (empty($reshook))
                         }
                     }
 
+					// Categories association
+					$custcats = GETPOST( 'custcats', 'array' );
+					if (!empty( $custcats )) {
+						$cat = new Categorie( $db );
+						foreach ($custcats as $id_category) {
+							$cat->fetch( $id_category );
+							$cat->add_type( $object, 'customer' );
+						}
+					}
+
                     // Logo/Photo save
                     $dir     = $conf->societe->multidir_output[$conf->entity]."/".$object->id."/logos/";
                     $file_OK = is_uploaded_file($_FILES['photo']['tmp_name']);
@@ -500,6 +511,22 @@ if (empty($reshook))
                     $error = $object->error; $errors = $object->errors;
                 }
 
+				// Categories association
+				// First we delete all categories association
+				$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . 'categorie_societe';
+				$sql .= ' WHERE fk_soc = ' . $object->id;
+				$db->query( $sql );
+
+				// Then we add the associated categories
+				$categories = GETPOST( 'custcats', 'array' );
+				if (!empty( $categories )) {
+					$cat = new Categorie( $db );
+					foreach ($categories as $id_category) {
+						$cat->fetch( $id_category );
+						$cat->add_type( $object, 'customer' );
+					}
+				}
+
                 // Logo/Photo save
                 $dir     = $conf->societe->multidir_output[$object->entity]."/".$object->id."/logos";
                 $file_OK = is_uploaded_file($_FILES['photo']['tmp_name']);
@@ -1197,6 +1224,12 @@ else
 			print '</td></tr>';
 		}
 
+		// Categories
+		print '<tr><td valign="top">'.$langs->trans("Categories").'</td><td colspan="3">';
+		$cate_arbo = $form->select_all_categories(Categorie::TYPE_CUSTOMER, null, 'parent', null, null, 1);
+		print $form->multiselectarray('custcats', $cate_arbo, GETPOST( 'custcats', 'array' ), null, null, null, null, 250);
+		print "</td></tr>";
+
         // Other attributes
         $parameters=array('colspan' => ' colspan="3"', 'colspanvalue' => '3');
         $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
@@ -1698,6 +1731,18 @@ else
                 print '</tr>';
             }
 
+			// Categories
+			print '<tr><td><label for="custcats">' . $langs->trans( "Categories" ) . '</label></td>';
+	        print '<td colspan="3">';
+			$cate_arbo = $form->select_all_categories( Categorie::TYPE_CUSTOMER, null, null, null, null, 1 );
+			$c = new Categorie( $db );
+			$cats = $c->containing( $object->id, Categorie::TYPE_CUSTOMER );
+			foreach ($cats as $cat) {
+				$arrayselected[] = $cat->id;
+			}
+			print $form->multiselectarray( 'custcats', $cate_arbo, $arrayselected, '', 0, '', 0, '100%' );
+			print "</td></tr>";
+
             // Other attributes
             $parameters=array('colspan' => ' colspan="3"', 'colspanvalue' => '3');
             $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
@@ -2124,6 +2169,12 @@ else
             print '</td></tr>';
         }
 
+		// Categories
+		print '<tr><td>' . $langs->trans( "Categories" ) . '</td>';
+		print '<td colspan="3">';
+		print $form->showCategories( $object->id, 'customer', 1 );
+		print "</td></tr>";
+
 		// Incoterms
 		if (!empty($conf->incoterm->enabled))
 		{