diff --git a/COPYRIGHT b/COPYRIGHT
deleted file mode 100644
index ce8234b0082e44fa1311233962b0c5fc0ce9beba..0000000000000000000000000000000000000000
--- a/COPYRIGHT
+++ /dev/null
@@ -1,12 +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 a99e2215c8c32fe9381fa416129529cb54598498..e499b53ded9d6fd6ee7c5bcf7ef9ac80ed205bc0 100644
--- a/README.md
+++ b/README.md
@@ -7,17 +7,9 @@ This repository contains OpenAPIs descriptions for the interfaces specified in E
 * [Navigate the API in the browser](https://forge.etsi.org/swagger/ui/?url=https://forge.etsi.org/gitlab/mec/gs016-ue-app-api/raw/develop/UEAppInterfaceApi.yaml).
 * [Edit the API online](https://forge.etsi.org/swagger/editor/?url=https://forge.etsi.org/gitlab/mec/gs016-ue-app-api/raw/develop/UEAppInterfaceApi.yaml).
 
-## ETSI Forge Copyright statement
+## License
 
-Copyright (c) ETSI 2019.
+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.
\ No newline at end of file
diff --git a/UEAppInterfaceApi.json b/UEAppInterfaceApi.json
index 03a4ed93a916ecfd756b2f8a39504443fa88a13a..f0f71a35cf53264e12ef4c17626c494dce940178 100644
--- a/UEAppInterfaceApi.json
+++ b/UEAppInterfaceApi.json
@@ -5,8 +5,8 @@
     "version": "1.1.1",
     "description": "The ETSI MEC ISG MEC016 UE Application Interface 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"
@@ -689,4 +689,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/UEAppInterfaceApi.yaml b/UEAppInterfaceApi.yaml
index 10fa57e2fbc46cdab137d7dc2476814b768880a3..b31962c59c533c24d1c2991105a2368efb677bc2 100644
--- a/UEAppInterfaceApi.yaml
+++ b/UEAppInterfaceApi.yaml
@@ -5,8 +5,8 @@ info:
   description: >-
     The ETSI MEC ISG MEC016 UE Application Interface 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:
@@ -544,4 +544,4 @@ components:
         application package shall comply with the definitions in clause 6.2.1.2
         of ETSI GS MEC 010-2
       type: string
-      format: uri
\ No newline at end of file
+      format: uri