diff --git a/LICENS.txt b/LICENSE.txt
similarity index 100%
rename from LICENS.txt
rename to LICENSE.txt
diff --git a/core-jdk8/pom.xml b/core-jdk8/pom.xml
index 9673ca5f4..a94c0e767 100644
--- a/core-jdk8/pom.xml
+++ b/core-jdk8/pom.xml
@@ -111,6 +111,7 @@
                 </executions>
             </plugin>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
                 <executions>
                     <execution>
@@ -129,6 +130,23 @@
                             </resources>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>copy-mapstruct-license</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/classes/META-INF</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>${basedir}/..</directory>
+                                    <filtering>false</filtering>
+                                    <include>LICENSE.txt</include>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
         </plugins>
diff --git a/core/pom.xml b/core/pom.xml
index 3f6a5c08c..0f4644fce 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -102,6 +102,7 @@
                 </executions>
             </plugin>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
                 <executions>
                     <execution>
@@ -120,6 +121,23 @@
                             </resources>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>copy-mapstruct-license</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/classes/META-INF</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>${basedir}/..</directory>
+                                    <filtering>false</filtering>
+                                    <include>LICENSE.txt</include>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
         </plugins>
diff --git a/distribution/src/main/assembly/dist.xml b/distribution/src/main/assembly/dist.xml
index 58a2cf0d7..95f761447 100644
--- a/distribution/src/main/assembly/dist.xml
+++ b/distribution/src/main/assembly/dist.xml
@@ -36,13 +36,6 @@
                 <include>org.mapstruct:mapstruct-processor</include>
             </includes>
         </dependencySet>
-
-        <dependencySet>
-            <outputDirectory>lib/dependencies</outputDirectory>
-            <includes>
-                <include>org.freemarker:freemarker</include>
-            </includes>
-        </dependencySet>
     </dependencySets>
 
     <files>
@@ -55,7 +48,7 @@
             <outputDirectory>/</outputDirectory>
         </file>
         <file>
-            <source>../license.txt</source>
+            <source>../LICENSE.txt</source>
             <outputDirectory>/</outputDirectory>
         </file>
         <file>
@@ -75,7 +68,7 @@
             <includes>
                 <include>../CONTRIBUTING.md</include>
                 <include>../copyright.txt</include>
-                <include>../license.txt</include>
+                <include>../LICENSE.txt</include>
                 <include>../pom.xml</include>
                 <include>../readme.md</include>
                 <include>../etc/license.txt</include>
diff --git a/parent/pom.xml b/parent/pom.xml
index 08837604f..e6721e1de 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -463,7 +463,7 @@
                         <exclude>**/build-config/checkstyle.xml</exclude>
                         <exclude>**/build-config/import-control.xml</exclude>
                         <exclude>copyright.txt</exclude>
-                        <exclude>**/license.txt</exclude>
+                        <exclude>**/LICENSE.txt</exclude>
                         <exclude>**/mapstruct.xml</exclude>
                         <exclude>**/toolchains-*.xml</exclude>
                         <exclude>**/eclipse-formatter-config.xml</exclude>
@@ -471,6 +471,8 @@
                         <exclude>readme.md</exclude>
                         <exclude>CONTRIBUTING.md</exclude>
                         <exclude>.gitattributes</exclude>
+                        <exclude>.gitignore</exclude>
+                        <exclude>.factorypath</exclude>
                     </excludes>
                 </configuration>
                 <executions>
diff --git a/processor/pom.xml b/processor/pom.xml
index 3c59f0b4c..8e8ed6635 100644
--- a/processor/pom.xml
+++ b/processor/pom.xml
@@ -99,6 +99,52 @@
                     </systemPropertyVariables>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>unpack-freemarker-license</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.freemarker</groupId>
+                                    <artifactId>freemarker</artifactId>
+                                    <outputDirectory>${project.build.directory}/classes/META-INF/freemarker</outputDirectory>
+                                    <includes>META-INF/LICENSE.txt,META-INF/NOTICE.txt</includes>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-mapstruct-license</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/classes/META-INF</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>${basedir}/..</directory>
+                                    <filtering>false</filtering>
+                                    <include>LICENSE.txt</include>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
@@ -111,11 +157,14 @@
                         </goals>
                         <configuration>
                             <minimizeJar>true</minimizeJar>
-                            <artifactSet>
-                                <includes>
-                                    <include>org.freemarker:freemarker</include>
-                                </includes>
-                            </artifactSet>
+                            <filters>
+                                <filter>
+                                    <artifact>org.freemarker:freemarker</artifact>
+                                    <excludes>
+                                        <exclude>META-INF/*.*</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
                             <relocations>
                                 <relocation>
                                     <pattern>freemarker</pattern>