diff --git a/dev-embedded/mphidflash/Manifest b/dev-embedded/mphidflash/Manifest
new file mode 100644
index 000000000..803035ce8
--- /dev/null
+++ b/dev-embedded/mphidflash/Manifest
@@ -0,0 +1,3 @@
+AUX mphidflash-1.6-makefile.patch 677 SHA256 9081efccf1ef424e940e7efc5b156b9cfd083ce41d949517778560eabfd0d55d SHA512 5b97ec326a6d277ca01c73e384987a6e3fa1c35365e5bac772f88594163d30bce3182567a53ad5329c0131438ffc06e97603a485e5d76901c40dadf9933c2ca2 WHIRLPOOL 5c49e97f241fda5e39317d30bcc30fd9085f51f41bef6e1d41d2fbde25ccfb6c0b1be59b3e6061331f5fc8b79d4e28d23f466e6739f5e9093271137e7f869b8e
+DIST mphidflash-1.6-src.tar.gz 27426 SHA256 303169dee7a0658380989287167d475e716168f588e5a8a7e751c33f16ae7850 SHA512 fbf72ba81a6004fcfb6f47346e643c7772465bcb449686f2ef8b01dc00159f0455ee64e6d8747de29bb1ef989e10d2153f1aa9c79f8d41bded57e5c6543cc76b WHIRLPOOL 28218bdff8cd3bd1b5520364c75b7ef6379daab9f25d2cf0e8117960b62df25a469a3224f0ee3dd3eda571159fc2d06f9921e50ed347e2c24243cc83bb868759
+EBUILD mphidflash-1.6.ebuild 818 SHA256 ef895a00bf7435524943f04f5f1dcc512b344d0392127b7c9e5fa6bd12c767ad SHA512 f71f2df157ed5a4ee708c35c00791b0686308bdceee711a03e51d497cd6993b53321d17f9be10b53d9c5d369e0c3e6180fa108fc4b27b1dbff818dc109922b92 WHIRLPOOL 371d21ab1995c07fa506dd1039029699a18d5cd4d49d31a320aa4babff85ce391b1be76e0165fb7437af82ce8cc5a54466b5fb32a22fe0e70a377b4338c6af97
diff --git a/dev-embedded/mphidflash/files/mphidflash-1.6-makefile.patch b/dev-embedded/mphidflash/files/mphidflash-1.6-makefile.patch
new file mode 100644
index 000000000..815756085
--- /dev/null
+++ b/dev-embedded/mphidflash/files/mphidflash-1.6-makefile.patch
@@ -0,0 +1,34 @@
+diff -Naur work/Makefile work-sane/Makefile
+--- work/Makefile	2015-07-06 15:18:23.976630752 -0400
++++ work-sane/Makefile	2015-07-06 15:18:45.810630212 -0400
+@@ -1,9 +1,9 @@
+ VERSION_MAIN = 1
+ VERSION_SUB  = 6
+ 
+-CC       = gcc
++CC       ?= gcc
+ OBJS     = main.o hex.o
+-EXECPATH = binaries
++EXECPATH = .
+ DISTPATH = dist
+ 
+ ifeq ($(shell uname -s),Darwin)
+@@ -15,8 +15,8 @@
+ else
+ # Rules for Linux, etc.
+   OBJS    += usb-libusb.o
+-  CFLAGS   = -O3 
+-  LDFLAGS  = -lusb
++  CFLAGS   ?= -O3
++  LDFLAGS  += -lusb
+   SYSTEM = linux
+ endif
+ 
+@@ -44,7 +44,6 @@
+ 
+ mphidflash: $(OBJS)
+ 	$(CC) $(OBJS) $(LDFLAGS) -o $(EXECPATH)/$(EXEC)
+-	strip $(EXECPATH)/$(EXEC)
+ 
+ install:
+ 	@echo
diff --git a/dev-embedded/mphidflash/mphidflash-1.6.ebuild b/dev-embedded/mphidflash/mphidflash-1.6.ebuild
new file mode 100644
index 000000000..dd15749be
--- /dev/null
+++ b/dev-embedded/mphidflash/mphidflash-1.6.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="ommand-line tool for communicating with the USB-Bootloader in PIC microcontrollers"
+HOMEPAGE="https://code.google.com/p/mphidflash/"
+#SRC_URI="https://mphidflash.googlecode.com/svn/trunk/dist/${P}-src.tar.gz"
+SRC_URI="http://dev.pentoo.ch/~zero/distfiles/${P}-src.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+DEPEND="virtual/libusb
+	dev-libs/libhid"
+RDEPEND="virtual/libusb"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/"${P}"-makefile.patch
+}
+
+src_compile() {
+	use x86 && emake mphidflash32
+	use amd64 && emake mphidflash64
+}
+
+src_install() {
+	use x86 && newbin ${P}-linux-32 ${PN}
+	use amd64 && newbin ${P}-linux-64 ${PN}
+}