diff --git a/net-p2p/amule/Manifest b/net-p2p/amule/Manifest
index 78f8b67b5..7992e76e2 100644
--- a/net-p2p/amule/Manifest
+++ b/net-p2p/amule/Manifest
@@ -1,7 +1,7 @@
-AUX amule-remove-stupid-parameter.patch 1415 RMD160 74a84df1b2ca4db871237c6b24a0a30001708b20 SHA1 7b181feb0172a6ab324fd3e0aac9dc434b4f9a89 SHA256 928a5bd4ddea3a224b11d8f07c8d290150c21ad9571370bf2118eefe18c09471
-MD5 9f794a12403e7b1b47b35b11124294ad files/amule-remove-stupid-parameter.patch 1415
-RMD160 74a84df1b2ca4db871237c6b24a0a30001708b20 files/amule-remove-stupid-parameter.patch 1415
-SHA256 928a5bd4ddea3a224b11d8f07c8d290150c21ad9571370bf2118eefe18c09471 files/amule-remove-stupid-parameter.patch 1415
+AUX amule-remove-stupid-parameter.patch 1327 RMD160 9fc434c54e9848c72ae252c1db702fefa413d9c2 SHA1 fb0307781449dbd514085ae07bdec8d775cb0474 SHA256 e04574dbb7c21fdbb0cf6b7dacf9f2309dc5847d11afaf9bd37f6223d8176c2d
+MD5 c7aaff9becaa3958000364a2bd1f50d9 files/amule-remove-stupid-parameter.patch 1327
+RMD160 9fc434c54e9848c72ae252c1db702fefa413d9c2 files/amule-remove-stupid-parameter.patch 1327
+SHA256 e04574dbb7c21fdbb0cf6b7dacf9f2309dc5847d11afaf9bd37f6223d8176c2d files/amule-remove-stupid-parameter.patch 1327
 AUX amuled.confd 409 RMD160 0e31c5aaa42c4ee2b6dfcd00afcde3b48b2d4299 SHA1 b5872943f5ec0ac41a7c054239a754f1f9669e09 SHA256 7af480fd6dd325ad66b37464417d4d89015a52722961d44da2e3f7990ac4959a
 MD5 6cfdc1b9b4a65d47e9047a8fed427889 files/amuled.confd 409
 RMD160 0e31c5aaa42c4ee2b6dfcd00afcde3b48b2d4299 files/amuled.confd 409
@@ -18,11 +18,11 @@ AUX amuleweb.initd 1171 RMD160 278b66c90ab82e37cb43a5ddbcdf599afd570a95 SHA1 8ac
 MD5 fcb8c3ac5b48723eee8565d59d0fb622 files/amuleweb.initd 1171
 RMD160 278b66c90ab82e37cb43a5ddbcdf599afd570a95 files/amuleweb.initd 1171
 SHA256 a4826cb4294184ac12fd712517397074fcf71a132640789132d761488b32b2da files/amuleweb.initd 1171
-DIST aMule-CVS-20070624.tar.bz2 3700516 RMD160 404af7c1da215804857615afc43b912303b052f3 SHA1 81842eadc6326828825f77a434b845bcd85f574d SHA256 9a453cba12a2e91dd749abd0b18b7d15b3e7da68b248f5541f54e7c0b7ecbd61
-EBUILD amule-2.2.0_pre20070624.ebuild 3130 RMD160 280b0b857aad02fac494019352b66d442213a44d SHA1 f3fa2da6e529f808bf4644bb151223cfde87c3d1 SHA256 bcb6295d1aef79bab995bb22035d4f3fb34bcebf6b64a8eeeef45f95a5955159
-MD5 5fb87b662ceb13ce9f9c0739c8acb4d0 amule-2.2.0_pre20070624.ebuild 3130
-RMD160 280b0b857aad02fac494019352b66d442213a44d amule-2.2.0_pre20070624.ebuild 3130
-SHA256 bcb6295d1aef79bab995bb22035d4f3fb34bcebf6b64a8eeeef45f95a5955159 amule-2.2.0_pre20070624.ebuild 3130
-MD5 efc5ed89a140ad084a7842a203a5a631 files/digest-amule-2.2.0_pre20070624 262
-RMD160 01a3a0db80a3119ca64e55cee4cd1e897b1ac2b3 files/digest-amule-2.2.0_pre20070624 262
-SHA256 ff1aa44897922f9ae390c86fbfb2a903477b73a88581a869019aef0bf86de332 files/digest-amule-2.2.0_pre20070624 262
+DIST aMule-CVS-20070815.tar.bz2 3827549 RMD160 dd5e2e8c6404966e2e7ca7a6e40eff0544fd5dc1 SHA1 614b0432541dbced6f87bdc3aa702fdcb6ff22e7 SHA256 7809b953f6630117dd072111a5f0c6c6b9fb9daa19fa8ce945b29665e75e2150
+EBUILD amule-2.2.0_pre20070815.ebuild 3130 RMD160 280b0b857aad02fac494019352b66d442213a44d SHA1 f3fa2da6e529f808bf4644bb151223cfde87c3d1 SHA256 bcb6295d1aef79bab995bb22035d4f3fb34bcebf6b64a8eeeef45f95a5955159
+MD5 5fb87b662ceb13ce9f9c0739c8acb4d0 amule-2.2.0_pre20070815.ebuild 3130
+RMD160 280b0b857aad02fac494019352b66d442213a44d amule-2.2.0_pre20070815.ebuild 3130
+SHA256 bcb6295d1aef79bab995bb22035d4f3fb34bcebf6b64a8eeeef45f95a5955159 amule-2.2.0_pre20070815.ebuild 3130
+MD5 c2a9cd84d1e1f854f70683ccf652a6af files/digest-amule-2.2.0_pre20070815 262
+RMD160 bab38a1c7ad18a3b420453cb154106a5685426be files/digest-amule-2.2.0_pre20070815 262
+SHA256 fdb0780f9af9ee45ece3ac5c4d28106261bce4dc61a9fc370968d5673f2be80c files/digest-amule-2.2.0_pre20070815 262
diff --git a/net-p2p/amule/amule-2.2.0_pre20070624.ebuild b/net-p2p/amule/amule-2.2.0_pre20070815.ebuild
similarity index 100%
rename from net-p2p/amule/amule-2.2.0_pre20070624.ebuild
rename to net-p2p/amule/amule-2.2.0_pre20070815.ebuild
diff --git a/net-p2p/amule/files/amule-remove-stupid-parameter.patch b/net-p2p/amule/files/amule-remove-stupid-parameter.patch
index 3334bd1df..f90bd0cf0 100644
--- a/net-p2p/amule/files/amule-remove-stupid-parameter.patch
+++ b/net-p2p/amule/files/amule-remove-stupid-parameter.patch
@@ -1,7 +1,7 @@
 diff -Nurp amule-cvs.orig/src/amule.cpp amule-cvs/src/amule.cpp
---- amule-cvs.orig/src/amule.cpp	2007-06-19 21:11:43.000000000 +0200
-+++ amule-cvs/src/amule.cpp	2007-06-24 11:27:05.000000000 +0200
-@@ -454,7 +454,6 @@ bool CamuleApp::OnInit()
+--- amule-cvs.orig/src/amule.cpp	2007-08-12 14:07:31.000000000 +0200
++++ amule-cvs/src/amule.cpp	2007-08-15 11:08:35.000000000 +0200
+@@ -456,7 +456,6 @@ bool CamuleApp::OnInit()
  	cmdline.AddSwitch(wxT("d"), wxT("disable-fatal"), wxT("Does not handle fatal exception."));
  	cmdline.AddSwitch(wxT("o"), wxT("log-stdout"), wxT("Print log messages to stdout."));
  	cmdline.AddSwitch(wxT("r"), wxT("reset-config"), wxT("Resets config to default values."));
@@ -9,7 +9,7 @@ diff -Nurp amule-cvs.orig/src/amule.cpp amule-cvs/src/amule.cpp
  	
  	// Show help on --help or invalid commands
  	if ( cmdline.Parse() ) {
-@@ -464,11 +463,6 @@ bool CamuleApp::OnInit()
+@@ -466,11 +465,6 @@ bool CamuleApp::OnInit()
  		return false;
  	}	
  
@@ -17,7 +17,7 @@ diff -Nurp amule-cvs.orig/src/amule.cpp amule-cvs/src/amule.cpp
 -		printf("This binary requires you to use the flag --even-if-lfroen-surreptitiously-removes-it-this-will-stay and only if you're very sure of it. Warning: If you're lfroen or wuischke, you might find this annoying. That pleases me.\n");
 -		return false;
 -	}	
--	
+-
+ 	bool ec_config = false;	
+ 	
  #ifdef AMULE_DAEMON
- 	if ( cmdline.Found(wxT("config-dir"), &ConfigDir) ) {
- 		if (ConfigDir.Last() != wxFileName::GetPathSeparator()) {
diff --git a/net-p2p/amule/files/digest-amule-2.2.0_pre20070624 b/net-p2p/amule/files/digest-amule-2.2.0_pre20070624
deleted file mode 100644
index 41399657b..000000000
--- a/net-p2p/amule/files/digest-amule-2.2.0_pre20070624
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 69a01e9eb93f51e44f1dc7039bdfad65 aMule-CVS-20070624.tar.bz2 3700516
-RMD160 404af7c1da215804857615afc43b912303b052f3 aMule-CVS-20070624.tar.bz2 3700516
-SHA256 9a453cba12a2e91dd749abd0b18b7d15b3e7da68b248f5541f54e7c0b7ecbd61 aMule-CVS-20070624.tar.bz2 3700516
diff --git a/net-p2p/amule/files/digest-amule-2.2.0_pre20070815 b/net-p2p/amule/files/digest-amule-2.2.0_pre20070815
new file mode 100644
index 000000000..4bbb9e764
--- /dev/null
+++ b/net-p2p/amule/files/digest-amule-2.2.0_pre20070815
@@ -0,0 +1,3 @@
+MD5 201bf0247780978a07525e879b65a243 aMule-CVS-20070815.tar.bz2 3827549
+RMD160 dd5e2e8c6404966e2e7ca7a6e40eff0544fd5dc1 aMule-CVS-20070815.tar.bz2 3827549
+SHA256 7809b953f6630117dd072111a5f0c6c6b9fb9daa19fa8ce945b29665e75e2150 aMule-CVS-20070815.tar.bz2 3827549