diff --git a/.gitignore b/.gitignore
index 5f2dbe1..83fb029 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,9 @@ release.properties
 dependency-reduced-pom.xml
 buildNumber.properties
 .mvn/timing.properties
+javaee8-essentials-archetype.iml
+.DS_Store/
+.idea/
 
 # Avoid ignoring Maven wrapper jar file (.jar files are usually ignored)
 !/.mvn/wrapper/maven-wrapper.jar
diff --git a/README.md b/README.md
index 807c51e..457df04 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ In the IDE of your choice use the group ```com.airhacks```, then the artifact id
 
 Shortcut (copy and paste, replace ```PROJECT_NAME``` and ```GROUP_ID```):
 
-```mvn archetype:generate -o -DarchetypeGroupId=com.airhacks -DarchetypeArtifactId=javaee8-essentials-archetype -DarchetypeVersion=0.0.4 -Darchetype.interactive=false --batch-mode -Dversion=0.0.1 -DgroupId=GROUP_ID -DartifactId=PROJECT_NAME```
+```mvn archetype:generate -o -DarchetypeGroupId=com.airhacks -DarchetypeArtifactId=javaee8-essentials-archetype -DarchetypeVersion=0.0.5 -Darchetype.interactive=false --batch-mode -Dversion=0.0.1 -DgroupId=GROUP_ID -DartifactId=PROJECT_NAME```
 
 The "Watch and Deploy" [WAD](https://github.com/AdamBien/wad) tool works best with this archetype. It continuously watches and deploys your ThinWAR without any additional configuration.
 
diff --git a/src/main/resources/META-INF/maven/archetype-metadata.xml b/src/main/resources/META-INF/maven/archetype-metadata.xml
index 481fd05..8fb6f3e 100644
--- a/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -22,8 +22,16 @@ limitations under the License.
 <archetype-descriptor xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd" name="javaee8-essentials-archetype"
                       xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
                       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <requiredProperties>
+        <requiredProperty key="version">
+            <defaultValue>1.0-SNAPSHOT</defaultValue>
+        </requiredProperty>
+        <requiredProperty key="groupId">
+            <defaultValue>com.airhacks</defaultValue>
+        </requiredProperty>
+    </requiredProperties>
     <fileSets>
-        <fileSet filtered="true" packaged="false" encoding="UTF-8">
+        <fileSet filtered="true" packaged="true" encoding="UTF-8">
             <directory>src/main/java</directory>
             <includes>
                 <include>**/*.java</include>
diff --git a/src/main/resources/archetype-resources/pom.xml b/src/main/resources/archetype-resources/pom.xml
index 576504a..70db6c9 100644
--- a/src/main/resources/archetype-resources/pom.xml
+++ b/src/main/resources/archetype-resources/pom.xml
@@ -24,6 +24,7 @@
         <finalName>${artifactId}</finalName>
     </build>
     <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <failOnMissingWebXml>false</failOnMissingWebXml>
diff --git a/src/main/resources/archetype-resources/src/main/java/com/airhacks/JAXRSConfiguration.java b/src/main/resources/archetype-resources/src/main/java/JAXRSConfiguration.java
similarity index 93%
rename from src/main/resources/archetype-resources/src/main/java/com/airhacks/JAXRSConfiguration.java
rename to src/main/resources/archetype-resources/src/main/java/JAXRSConfiguration.java
index 91b2226..da4e070 100644
--- a/src/main/resources/archetype-resources/src/main/java/com/airhacks/JAXRSConfiguration.java
+++ b/src/main/resources/archetype-resources/src/main/java/JAXRSConfiguration.java
@@ -1,4 +1,4 @@
-package com.airhacks;
+package ${package};
 
 import javax.ws.rs.ApplicationPath;
 import javax.ws.rs.core.Application;
diff --git a/src/main/resources/archetype-resources/src/main/java/com/airhacks/ping/boundary/PingResource.java b/src/main/resources/archetype-resources/src/main/java/ping/boundary/PingResource.java
similarity index 91%
rename from src/main/resources/archetype-resources/src/main/java/com/airhacks/ping/boundary/PingResource.java
rename to src/main/resources/archetype-resources/src/main/java/ping/boundary/PingResource.java
index 8a88dda..29d2a7a 100644
--- a/src/main/resources/archetype-resources/src/main/java/com/airhacks/ping/boundary/PingResource.java
+++ b/src/main/resources/archetype-resources/src/main/java/ping/boundary/PingResource.java
@@ -1,4 +1,4 @@
-package com.airhacks.ping.boundary;
+package ${package}.ping.boundary;
 
 import javax.inject.Inject;
 import javax.ws.rs.GET;