diff --git a/LICENSE b/LICENSE
index 745c4629c77788d5b1449a27f54b305ce4677cac..c7a6ba06afc8440ff3742ee50286ada519c15dec 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,25 +1,23 @@
-ETSI Software License
+Copyright 2019 ETSI
 
-As long as the hereunder conditions are respected, non-exclusive permission is 
-hereby granted, free of charge, to use, reproduce and modify this software 
-source code, under the following conditions:
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, 
+   this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice, 
+   this list of conditions and the following disclaimer in the documentation 
+   and/or other materials provided with the distribution.
+3. Neither the name of the copyright holder nor the names of its contributors 
+   may be used to endorse or promote products derived from this software without 
+   specific prior written permission.
 
-- This source code is provided “AS IS” with no warranties, express or implied, 
-  including but not limited to, the warranties of merchantability, fitness for 
-  a particular purpose and warranties for non-infringement of intellectual 
-  property rights. ETSI shall not be held liable in any event for any direct or 
-  indirect damages whatsoever (including, without limitation, damages for loss 
-  of profits, business interruption, loss of information, or any other pecuniary 
-  loss) arising out of or related to the use of or inability to use the 
-  source code.
-  
-- This permission is granted to facilitate the implementation of the related 
-  ETSI standard, provided that ETSI is given the right to use, reproduce and 
-  amend the modified source code under the same conditions as the 
-  present permission.
-  
-- This permission does not apply to any documentation associated with this 
-  source code for which ETSI keeps all rights reserved. 
-  
-The present ETSI Source Code license shall be included in all copies of whole 
-or part of this source code and shall not imply any sub-license right.
\ No newline at end of file
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE 
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 
+OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/README.md b/README.md
index 759bbf43722617d90b3cf7a8aa6366db6eb70b3d..4eec5b6c89eb3da975db9b57b22bc947aaf852e8 100644
--- a/README.md
+++ b/README.md
@@ -34,17 +34,3 @@ Change requests can be filed at [ETSI Forge Bugzilla](<LINK>). Please report err
 ETSI Forge uses Gitlab to manage submissions to the repository.
 For more information on setting up your environment and contributing, you may refer to the [ETSI Forge wiki](https://forge.etsi.org/wiki/index.php/Main_Page).
 
-## License
-
-Copyright (c) ETSI 2018.
- 
-This software is subject to copyrights owned by ETSI. Non-exclusive permission 
-is hereby granted, free of charge, to copy, reproduce and amend this file 
-under the following conditions: It is provided "as is", without warranty of any 
-kind, expressed or implied. 
-
-ETSI shall never be liable for any claim, damages, or other liability arising 
-from its use or inability of use.This permission does not apply to any documentation 
-associated with this file for which ETSI keeps all rights reserved. The present 
-copyright notice shall be included in all copies of whole or part of this 
-file and shall not imply any sub-license right.