diff --git a/COPYRIGHT b/COPYRIGHT
deleted file mode 100644
index 347c57e81206e5db911e19ace1c0a3a98c19ffa9..0000000000000000000000000000000000000000
--- a/COPYRIGHT
+++ /dev/null
@@ -1,7 +0,0 @@
-ETSI FORGE COPYRIGHT STATEMENT 
-
-Copyright (c) ETSI 2017. 
-
-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 software and shall not imply any sub-license right.
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000000000000000000000000000000000000..f4fc2ea8d28f66583f45f07f8cbef6bd93b2f2fa
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,24 @@
+Copyright 2019 ETSI
+
+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 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 be7269917e799763ff02a23c4763ca455853f502..3dc25cb7f6e9820757bb11c3f3813fc803314ed6 100644
--- a/README.md
+++ b/README.md
@@ -7,18 +7,11 @@ This repository contains OpenAPIs descriptions for the interfaces specified in E
 * [Navigate the API in the browser](https://forge.etsi.org/swagger/editor/?url=https://forge.etsi.org/gitlab/mec/gs014-ue-identity-api/raw/master/UEidentityAPI.yaml).
 * [Edit the API online](https://forge.etsi.org/swagger/editor/?url=https://forge.etsi.org/gitlab/mec/gs014-ue-identity-api/raw/master/UEidentityAPI.yaml).
 
-## ETSI Forge Copyright statement
+## License
 
-Copyright (c) ETSI 2018.
+Unless specified otherwise, the content of this repository and the files contained 
+are released under the BSD-3-Clause license.
+See the attached LICENSE file or visit https://forge.etsi.org/legal-matters.
 
-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 
-software and shall not imply any sub-license right.
 
diff --git a/UEidentityAPI.json b/UEidentityAPI.json
index cc5098e9ed472c9dec4e55745584d9e974327ce8..2d0458cca2688d948eb4b9b22b06d2537e52cc48 100644
--- a/UEidentityAPI.json
+++ b/UEidentityAPI.json
@@ -5,8 +5,8 @@
     "version": "1.1.1",
     "description": "The ETSI MEC ISG MEC014 UE Identity API described using OpenAPI",
     "license": {
-      "name": "ETSI Forge copyright notice",
-      "url": "https://forge.etsi.org/etsi-forge-copyright-notice.txt"
+      "name": "BSD-3-Clause",
+      "url": "https://forge.etsi.org/legal-matters"
     },
     "contact": {
       "email": "cti_support@etsi.org"
@@ -307,4 +307,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/UEidentityAPI.yaml b/UEidentityAPI.yaml
index 3ada56c87030e5e9c79e88935d0d1cc830217e5b..001594bddc4007d7f15c262d1afbe943bac82fe3 100644
--- a/UEidentityAPI.yaml
+++ b/UEidentityAPI.yaml
@@ -4,8 +4,8 @@ info:
   version: 1.1.1
   description: The ETSI MEC ISG MEC014 UE Identity API described using OpenAPI
   license:
-    name: ETSI Forge copyright notice
-    url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
+    name: BSD-3-Clause
+    url: https://forge.etsi.org/legal-matters
   contact:
     email: cti_support@etsi.org
 externalDocs:
@@ -216,4 +216,4 @@ components:
       enum:
         - UNREGISTERED
         - REGISTERED
-      example: REGISTERED
\ No newline at end of file
+      example: REGISTERED