diff --git a/.gitignore b/.gitignore
index ba528a19ef3303cd80651c649f8f6fcedbeeb108..ae91f72929d3edca467a68702753e6a8bdcebe87 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 bin/
 target/
-certs/
\ No newline at end of file
+certs/
+
+build/[0-9]*.[0-9]*.[0-9]*
\ No newline at end of file
diff --git a/BudgetMasterClient/pom.xml b/BudgetMasterClient/pom.xml
index 569c1b54bc4cfc7bf17e99aaf804a13dc62b745d..0fd1b201a4cdfd1bc86058a0aba07acd18e5f381 100644
--- a/BudgetMasterClient/pom.xml
+++ b/BudgetMasterClient/pom.xml
@@ -10,14 +10,50 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.7.0</version>
 				<configuration>
 					<source>1.8</source>
 					<target>1.8</target>
 				</configuration>
 			</plugin>
+			<!-- LAUNCH4J -->
+			<plugin>
+				<groupId>com.akathist.maven.plugins.launch4j</groupId>
+				<artifactId>launch4j-maven-plugin</artifactId>
+				<version>1.7.21</version>
+				<executions>
+					<execution>
+						<id>l4j-clui</id>
+						<phase>package</phase>
+						<goals>
+							<goal>launch4j</goal>
+						</goals>
+						<configuration>
+							<headerType>gui</headerType>
+							<jar>../build/${project.version}/BudgetMasterClient-v${project.version}.jar</jar>
+							<outfile>../build/${project.version}/BudgetMasterClient-v${project.version}.exe</outfile>
+							<downloadUrl>http://java.com/download</downloadUrl>
+							<classPath>
+								<mainClass>de.deadlocker8.budgetmasterclient.main.Main</mainClass>
+							</classPath>
+							<jre>
+								<bundledJre64Bit>false</bundledJre64Bit>
+								<bundledJreAsFallback>false</bundledJreAsFallback>
+								<minVersion>1.8.0</minVersion>
+								<jdkPreference>preferJre</jdkPreference>
+								<runtimeBits>64/32</runtimeBits>
+							</jre>
+							<icon>../build/icon.ico</icon>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
 				<configuration>
+					<outputDirectory>../build/${project.version}</outputDirectory>
+					<finalName>BudgetMasterClient-v${project.version}</finalName>
+					<appendAssemblyId>false</appendAssemblyId>
 					<archive>
 						<manifest>
 							<mainClass>de.deadlocker8.budgetmasterclient.main.Main</mainClass>
@@ -37,14 +73,6 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<version>3.0.2</version>
-				<configuration>
-					<outputDirectory>../build</outputDirectory>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
 
diff --git a/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_de.properties b/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_de.properties
index cbf29d3b391d6d6cb859c45a120adea8ddbaad7d..5a19c4b0a6dccc44aa584547dba8e3691020d332 100644
--- a/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_de.properties
+++ b/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_de.properties
@@ -1,8 +1,8 @@
 # DEFAULT
 app.name=BudgetMaster
 version.code=10
-version.name=1.6.0_alpha
-version.date=31.08.17
+version.name=1.6.0
+version.date=03.10.17
 author=Robert Goldmann
 credits=L�nderflaggen von Freepik auf https://www.flaticon.com\nVerwendete Schriftarten: OpenSans
 
diff --git a/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_en.properties b/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_en.properties
index 1620c6e72883db130144c38fdda74f55043d25a2..0214f27fde602c718e1bec53b1d896c7d19c875c 100644
--- a/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_en.properties
+++ b/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_en.properties
@@ -1,8 +1,8 @@
 # DEFAULT
 app.name=BudgetMaster
 version.code=10
-version.name=1.6.0_alpha
-version.date=31.08.17
+version.name=1.6.0
+version.date=03.10.17
 author=Robert Goldmann
 credits=Flags by Freepik on https://www.flaticon.com\nFonts used: OpenSans
 
diff --git a/BudgetMasterServer/pom.xml b/BudgetMasterServer/pom.xml
index 55aab25b38b5822bc616af38d98cb6799c5d02eb..f0aff38da07c472479abd04afc342b0dc32962e4 100644
--- a/BudgetMasterServer/pom.xml
+++ b/BudgetMasterServer/pom.xml
@@ -10,6 +10,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.7.0</version>
 				<configuration>
 					<source>1.8</source>
 					<target>1.8</target>
@@ -18,6 +19,9 @@
 			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
 				<configuration>
+					<outputDirectory>../build/${project.version}</outputDirectory>
+					<finalName>BudgetMasterServer-v${project.version}</finalName>
+					<appendAssemblyId>false</appendAssemblyId>
 					<archive>
 						<manifest>
 							<mainClass>de.deadlocker8.budgetmasterserver.main.Main</mainClass>
@@ -36,15 +40,7 @@
 						</goals>
 					</execution>
 				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<version>3.0.2</version>
-				<configuration>
-					<outputDirectory>../build</outputDirectory>
-				</configuration>
-			</plugin>
+			</plugin>			
 		</plugins>
 	</build>
 
diff --git a/BudgetMasterServer/src/main/resources/de/deadlocker8/budgetmasterserver/_en.properties b/BudgetMasterServer/src/main/resources/de/deadlocker8/budgetmasterserver/_en.properties
index 9a6167b39161f92cc7325cd55bdf1c46419296a3..8de2a69fbfed7d822d9ebdf32a042ce1c98893ef 100644
--- a/BudgetMasterServer/src/main/resources/de/deadlocker8/budgetmasterserver/_en.properties
+++ b/BudgetMasterServer/src/main/resources/de/deadlocker8/budgetmasterserver/_en.properties
@@ -1,7 +1,7 @@
 app.name=BudgetMasterServer
 version.code=10
-version.name=1.6.0_alpha
-version.date=31.08.17
+version.name=1.6.0
+version.date=03.10.17
 author=Robert Goldmann
 
 category.none=No Category