diff --git a/dev-util/uncrustify/Manifest b/dev-util/uncrustify/Manifest
new file mode 100644
index 0000000..3d39301
--- /dev/null
+++ b/dev-util/uncrustify/Manifest
@@ -0,0 +1,2 @@
+DIST uncrustify-0.64.tar.gz 1178957 SHA256 2a8cb3ab82ca53202d50fc2c2cec0edd11caa584def58d356c1c759b57db0b32 SHA512 bc7361520adc3c95c9ba3dffeabadec4219af1827ed2f4ae0c4ad94a0f366490854ed40d09ecc6bf3f34941bf87722f013e01d1a1684c9f7fb1adac6dd4fee01 WHIRLPOOL 1e45748b8dc3c2c99dd774677d539b4bd7e1f4f52c3e9a40894df3ab67780767604dd845e9ffc6f69eb23980e447ce8d82c526eba1236454194baac5f25d9a84
+DIST uncrustify-0.65.tar.gz 1378026 SHA256 45e954cd207ee4f6531d72ece27554ef4e0e9f64c912b523bc80ad6a36404110 SHA512 b136003cab6547d72aa6b60cbc7cc680516b5116b40a9cc658d544daee9dc56fd8f404e5f6871c672a4017a760f4d7f7ae23b0957b3e5d5a4d801fc71b4a0b51 WHIRLPOOL c91173d58cd619b5b074ab6db1dc847331b7e087bdc68ff79197d7e57bb8a73d65e67ef88d335d703e06aae3b9bb795e39b8bb033708c9dce93c41754c2f2ff7
diff --git a/dev-util/uncrustify/metadata.xml b/dev-util/uncrustify/metadata.xml
new file mode 100644
index 0000000..370ea02
--- /dev/null
+++ b/dev-util/uncrustify/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>grobian@gentoo.org</email>
+		<name>Fabian Groffen</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>alexxy@gentoo.org</email>
+		<name>Alexey Shvetosov</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">uncrustify</remote-id>
+		<remote-id type="github">uncrustify/uncrustify</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/uncrustify/uncrustify-0.64.ebuild b/dev-util/uncrustify/uncrustify-0.64.ebuild
new file mode 100644
index 0000000..d0891fc
--- /dev/null
+++ b/dev-util/uncrustify/uncrustify-0.64.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ $PV == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	KEYWORDS=""
+	SRC_URI=""
+	scm_eclass=git-r3
+else
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
+	S=${WORKDIR}/${PN}-${P}
+fi
+
+inherit cmake-utils ${scm_eclass}
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-any-r1
+
+DESCRIPTION="C/C++/C#/D/Java/Pawn code indenter and beautifier"
+HOMEPAGE="http://uncrustify.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="test"
+
+DEPEND="test? ( ${PYTHON_DEPS} )"
+
+python_test() {
+	cd tests
+	${EPYTHON} run_tests.py || die "tests failed"
+}
diff --git a/dev-util/uncrustify/uncrustify-0.65.ebuild b/dev-util/uncrustify/uncrustify-0.65.ebuild
new file mode 100644
index 0000000..d0891fc
--- /dev/null
+++ b/dev-util/uncrustify/uncrustify-0.65.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ $PV == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	KEYWORDS=""
+	SRC_URI=""
+	scm_eclass=git-r3
+else
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
+	S=${WORKDIR}/${PN}-${P}
+fi
+
+inherit cmake-utils ${scm_eclass}
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-any-r1
+
+DESCRIPTION="C/C++/C#/D/Java/Pawn code indenter and beautifier"
+HOMEPAGE="http://uncrustify.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="test"
+
+DEPEND="test? ( ${PYTHON_DEPS} )"
+
+python_test() {
+	cd tests
+	${EPYTHON} run_tests.py || die "tests failed"
+}