diff --git a/dev-util/uncrustify/ChangeLog b/dev-util/uncrustify/ChangeLog
index 86b005dd..1ad21572 100644
--- a/dev-util/uncrustify/ChangeLog
+++ b/dev-util/uncrustify/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 Oct 2007; Mario Fetka <mario-fetka@gmx.at> ++:
+  Update to 0.40
+
   05 Oct 2007; Mario Fetka <mario-fetka@gmx.at> ChangeLog:
   first ebuild for uncrustifiy
 
diff --git a/dev-util/uncrustify/Manifest b/dev-util/uncrustify/Manifest
index e71ac6e8..53341196 100644
--- a/dev-util/uncrustify/Manifest
+++ b/dev-util/uncrustify/Manifest
@@ -1,12 +1,17 @@
 DIST uncrustify-0.38.tgz 638886 RMD160 e8919539debe73cd37e28c3cddac1dc8af0e3eb5 SHA1 f3c85e275e5e148f1e989fad8c246ad9eb993a08 SHA256 d4558c80d1a103b634970f2d7380e88220d3f02e0f60b1ccd47fa121167a1b54
+DIST uncrustify-0.40.tgz 656444 RMD160 8b1a1739ccdb918c717aeb0932c4f76e0b8fef25 SHA1 587957713019ae4179ee9bee032599e052134450 SHA256 a4e6524e9968001dcd68bda1cea2782be70e12965704c4d830828a18cfb56131
 EBUILD uncrustify-0.38.ebuild 435 RMD160 4688f9fa34ccdc4244638f7f7d066c8d019013cc SHA1 7a2b2ab444c61dbea7cc32ec8ad2a1399a861cb7 SHA256 6105fa3514ddcdf656022bb9bcb6efe6a6ddd285bcc3657ef1827885af4daf76
 MD5 6f39b8732f57a8510d71f41b344c2d10 uncrustify-0.38.ebuild 435
 RMD160 4688f9fa34ccdc4244638f7f7d066c8d019013cc uncrustify-0.38.ebuild 435
 SHA256 6105fa3514ddcdf656022bb9bcb6efe6a6ddd285bcc3657ef1827885af4daf76 uncrustify-0.38.ebuild 435
-MISC ChangeLog 211 RMD160 0f1cbb709233518c770e4c56c1f8e810fcde2bb7 SHA1 e37a531d18910c654472aba0e98d2dfddf34b727 SHA256 f829a25501c172a2991258a05d71a33a69e9a75a3079f76ac4884a53b08e0b32
-MD5 52d9321fb148b5f64e673291b0cbb297 ChangeLog 211
-RMD160 0f1cbb709233518c770e4c56c1f8e810fcde2bb7 ChangeLog 211
-SHA256 f829a25501c172a2991258a05d71a33a69e9a75a3079f76ac4884a53b08e0b32 ChangeLog 211
+EBUILD uncrustify-0.40.ebuild 435 RMD160 4688f9fa34ccdc4244638f7f7d066c8d019013cc SHA1 7a2b2ab444c61dbea7cc32ec8ad2a1399a861cb7 SHA256 6105fa3514ddcdf656022bb9bcb6efe6a6ddd285bcc3657ef1827885af4daf76
+MD5 6f39b8732f57a8510d71f41b344c2d10 uncrustify-0.40.ebuild 435
+RMD160 4688f9fa34ccdc4244638f7f7d066c8d019013cc uncrustify-0.40.ebuild 435
+SHA256 6105fa3514ddcdf656022bb9bcb6efe6a6ddd285bcc3657ef1827885af4daf76 uncrustify-0.40.ebuild 435
+MISC ChangeLog 281 RMD160 533df55d0e1cede63cff74ed1cb5f40a57d8e7e2 SHA1 31abd40ca7ba82e7f9a236618445965a776245c6 SHA256 cbffd7eaf11233ccbcf56b1b3a46f4c06be4da8d6863ba8d87b119a6913bd145
+MD5 07601e928fb61e9fb62644478d1f9cf8 ChangeLog 281
+RMD160 533df55d0e1cede63cff74ed1cb5f40a57d8e7e2 ChangeLog 281
+SHA256 cbffd7eaf11233ccbcf56b1b3a46f4c06be4da8d6863ba8d87b119a6913bd145 ChangeLog 281
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170
@@ -14,3 +19,6 @@ SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 metadata
 MD5 97a1717e2e389d0675cd6e5d0d250bb0 files/digest-uncrustify-0.38 238
 RMD160 19b4b80c911c5509e15e4f3aeeae054f23e8784e files/digest-uncrustify-0.38 238
 SHA256 f6f3485efd4babc69d39cba44d1db708dcc553535cc66b6b59e47b63d175c041 files/digest-uncrustify-0.38 238
+MD5 761592889b12bc4ce19bf58ffd65c083 files/digest-uncrustify-0.40 238
+RMD160 0e218e196eed458998d685a932105a06d9802e83 files/digest-uncrustify-0.40 238
+SHA256 86b9bcb84739e123116fc5d04d69a4214bdfd729953b4c8451bb624d762a0f54 files/digest-uncrustify-0.40 238
diff --git a/dev-util/uncrustify/files/digest-uncrustify-0.40 b/dev-util/uncrustify/files/digest-uncrustify-0.40
new file mode 100644
index 00000000..7ab77642
--- /dev/null
+++ b/dev-util/uncrustify/files/digest-uncrustify-0.40
@@ -0,0 +1,3 @@
+MD5 ec917a5e1b81206527db917981540d49 uncrustify-0.40.tgz 656444
+RMD160 8b1a1739ccdb918c717aeb0932c4f76e0b8fef25 uncrustify-0.40.tgz 656444
+SHA256 a4e6524e9968001dcd68bda1cea2782be70e12965704c4d830828a18cfb56131 uncrustify-0.40.tgz 656444
diff --git a/dev-util/uncrustify/uncrustify-0.40.ebuild b/dev-util/uncrustify/uncrustify-0.40.ebuild
new file mode 100644
index 00000000..8e4b7f23
--- /dev/null
+++ b/dev-util/uncrustify/uncrustify-0.40.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+DESCRIPTION="Source Code Beautifier for C, C++, C#, D, Java, and Pawn"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+HOMEPAGE="http://uncrustify.sourceforge.net/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 -ppc -sparc -alpha"
+IUSE=""
+
+#src_compile() {
+#	make || die
+#}
+
+src_install() {
+	emake DESTDIR=${D} install
+}