diff --git a/sci-electronics/librepcb/additional-files/icons.zip b/sci-electronics/librepcb/additional-files/icons.zip
new file mode 100644
index 000000000..417b90618
Binary files /dev/null and b/sci-electronics/librepcb/additional-files/icons.zip differ
diff --git a/sci-electronics/librepcb/librepcb-0.1.5.recipe b/sci-electronics/librepcb/librepcb-0.1.6.recipe
similarity index 68%
rename from sci-electronics/librepcb/librepcb-0.1.5.recipe
rename to sci-electronics/librepcb/librepcb-0.1.6.recipe
index f67dfe9ca..9eda33d32 100644
--- a/sci-electronics/librepcb/librepcb-0.1.5.recipe
+++ b/sci-electronics/librepcb/librepcb-0.1.6.recipe
@@ -13,10 +13,13 @@ COPYRIGHT="Urban Bruhin"
 LICENSE="GNU GPL v3"
 REVISION="1"
 SOURCE_URI="https://download.librepcb.org/releases/$portVersion/librepcb-$portVersion-source.zip"
-CHECKSUM_SHA256="f956dfa5b9ad1faffcab7f5dd03f158c2b97a7c82cfc9a09dc4066cbcf0db76a"
+CHECKSUM_SHA256="8c7bf475ed59eb5b5e4b13073b96b9468ee01fb6980ef2b3471b1fbb39c46721"
 SOURCE_DIR="librepcb-$portVersion"
 PATCHES="librepcb-$portVersion.patchset"
-ADDITIONAL_FILES="librepcb.rdef.in"
+ADDITIONAL_FILES="
+	librepcb.rdef.in
+	icons.zip
+	"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
@@ -24,7 +27,9 @@ SECONDARY_ARCHITECTURES="x86"
 PROVIDES="
 	librepcb$secondaryArchSuffix = $portVersion
 	app:LibrePCB$secondaryArchSuffix = $portVersion
+	cmd:eagle_import = $portVersion
 	cmd:librepcb_cli = $portVersion
+	cmd:uuid_generator = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -42,33 +47,45 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
+	cmd:cmake
 	cmd:g++$secondaryArchSuffix
 	cmd:lrelease$secondaryArchSuffix >= 5
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
-	cmd:qmake$secondaryArchSuffix >= 5
+	cmd:unzip
 	"
 
+PATCH()
+{
+	unzip -o $sourceDir/../../additional-files/icons.zip -d $sourceDir/img
+}
+
 BUILD()
 {
 	mkdir -p build
 	cd build
 
-	qmake ../librepcb.pro \
-		PREFIX=$appsDir/LibrePCB
+	cmake .. \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_PREFIX=$appsDir/LibrePCB
 
 	make $jobArgs
 }
 
 INSTALL()
 {
-	cd build
-	make install
+	mkdir -p $prefix/bin $appsDir/LibrePCB/{bin,share}
+
+	cp build/apps/librepcb/librepcb $appsDir/LibrePCB/bin/LibrePCB
+	cp build/apps/librepcb-cli/librepcb-cli $appsDir/LibrePCB/bin
+	cp build/apps/EagleImport/eagle-import $appsDir/LibrePCB/bin
+	cp build/apps/UuidGenerator/uuid-generator $appsDir/LibrePCB/bin
+	cp -R share/librepcb $appsDir/LibrePCB/share
 
-	mkdir -p $prefix/bin
-	mv $appsDir/LibrePCB/bin/librepcb $appsDir/LibrePCB/bin/LibrePCB
-	ln -s $appsDir/LibrePCB/bin/librepcb-cli $prefix/bin
 	ln -s $appsDir/LibrePCB/bin/LibrePCB $appsDir/LibrePCB/LibrePCB
+	ln -s $appsDir/LibrePCB/bin/librepcb-cli $prefix/bin/librepcb-cli
+	ln -s $appsDir/LibrePCB/bin/eagle-import $prefix/bin/eagle-import
+	ln -s $appsDir/LibrePCB/bin/uuid-generator $prefix/bin/uuid-generator
 
 	local APP_SIGNATURE="application/x-vnd.librepcb"
 	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
@@ -84,5 +101,7 @@ INSTALL()
 		$portDir/additional-files/librepcb.rdef.in > $sourceDir/librepcb.rdef
 
 	addResourcesToBinaries $sourceDir/librepcb.rdef $appsDir/LibrePCB/bin/LibrePCB
+	mimeset -f $appsDir/LibrePCB/bin/LibrePCB
+
 	addAppDeskbarSymlink $appsDir/LibrePCB/bin/LibrePCB LibrePCB
 }
diff --git a/sci-electronics/librepcb/patches/librepcb-0.1.5.patchset b/sci-electronics/librepcb/patches/librepcb-0.1.6.patchset
similarity index 100%
rename from sci-electronics/librepcb/patches/librepcb-0.1.5.patchset
rename to sci-electronics/librepcb/patches/librepcb-0.1.6.patchset