diff --git a/doap.rdf b/doap.rdf
index ac446cc..6037f18 100644
--- a/doap.rdf
+++ b/doap.rdf
@@ -24,8 +24,9 @@
          xmlns:foaf="http://xmlns.com/foaf/0.1/">
 
   <Project rdf:about="https://freemarker.apache.org/">
+    <name>Apache FreeMarker</name>
+    <homepage rdf:resource="https://freemarker.apache.org" />
     <created>2015-09-02</created><!-- When FreeMaker entered ASF, this must be later changed to real data of "TLPisation" -->
-    <name>Apache FreeMarker</name><!-- I guess it's OK even if not TLP yet, else "Freemarker" will do -->
     <shortdesc xml:lang="en">FreeMarker is a template engine, i.e. a generic tool to generate text output based on templates. FreeMarker is implemented in Java as a class library for programmers.</shortdesc>
     <description>
           Apache FreeMarker is a template engine: a Java library to generate text output (HTML web pages, e-mails, configuration files, source code, etc.) based on templates and changing data.
@@ -33,14 +34,16 @@
           You meant to prepare the data to display in a real programming language, like issue database queries and do business calculations, and then the template displays that already prepared data.
           In the template you are focusing on how to present the data, and outside the template you are focusing on what data to present.
     </description>
+
     <programming-language>Java</programming-language>
     <category rdf:resource="http://projects.apache.org/category/Java" /><!-- Categories are possibly to be modified -->
     <category rdf:resource="http://projects.apache.org/category/html" />
     <category rdf:resource="http://projects.apache.org/category/templating" />
     <category rdf:resource="http://projects.apache.org/category/content" />
-    <homepage rdf:resource="https://freemarker.apache.org" />
-    <license rdf:resource="http://www.apache.org/licenses/" />
+
+    <license rdf:resource="https://www.apache.org/licenses/LICENSE-2.0" />
     <asfext:pmc rdf:resource="http://incubator.apache.org" />
+
     <bug-database rdf:resource="https://issues.apache.org/jira/browse/FREEMARKER" />
     <mailing-list rdf:resource="https://freemarker.apache.org/mailing-lists.html" />
     <download-page rdf:resource="https://freemarker.apache.org/freemarkerdownload.html" />