diff --git a/games-emulation/mednafen/Manifest b/games-emulation/mednafen/Manifest
index 676df0c..9d44c32 100644
--- a/games-emulation/mednafen/Manifest
+++ b/games-emulation/mednafen/Manifest
@@ -1,4 +1,2 @@
-AUX mednafen-0.9.19-psx-debug.patch 398 RMD160 e8706880bd304f7649470856805e9f62973d2656 SHA1 672dfe9b682e4c2484bd25f8788de0a13ac7fdaa SHA256 d6e01ac60e2d463d78efec65a76431d81a615b9c2afbd5093040d4897be389f7
-AUX mednafen-0.9.19-zlib-1.2.6.patch 1005 RMD160 af72daab954cfa81668337270262956294492035 SHA1 140968f3f194274b13d7ccba4657b56c29fac798 SHA256 de2cd0b4ef72e7e32b523d8d9d2b452376e8aab4e931055ab57b4ee906580dac
-DIST mednafen-0.9.19.tar.bz2 3710809 RMD160 be8be3544915ee7804b5510790417983fb4ef555 SHA1 319ecb59cfca1baa9e733cb695186cc86f36151a SHA256 f09d0783676a52eb7b24941f50065b52e748107c50194ec96a8095a7956b7864
-EBUILD mednafen-0.9.19-r1.ebuild 1722 RMD160 308f3c25494afbcadd2545682a11a1e1fe2689c0 SHA1 276853afc3cd7f8a3e097f200bdd92bb29bff59d SHA256 c2a16f0291015522292bc94f44057164e182d174d63e59a3add72f3bc109c44a
+DIST mednafen-0.9.21.tar.bz2 3770486 RMD160 412954c5bc769cdfdc7e4dc9d15e272a5072903a SHA1 983c349ca991190363b713ac8abf7ae78b081a21 SHA256 2c1074337cedd61091b8695915d1bc7cf3f7ad5bbdda755e7b99e32834fc052d
+EBUILD mednafen-0.9.21.ebuild 1638 RMD160 634a047fe891357df57d9377fee11238893c5061 SHA1 ced3c656319394679a5518ca5be7e27aa4a613c4 SHA256 a60b1eab27d00120c25167af93b1f7dfc1518c1431e635aa3c8814dc863e9ba9
diff --git a/games-emulation/mednafen/files/mednafen-0.9.19-psx-debug.patch b/games-emulation/mednafen/files/mednafen-0.9.19-psx-debug.patch
deleted file mode 100644
index 11fe11a..0000000
--- a/games-emulation/mednafen/files/mednafen-0.9.19-psx-debug.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/psx/gpu.cpp b/src/psx/gpu.cpp
-index 78fb66f..107cab0 100644
---- a/src/psx/gpu.cpp
-+++ b/src/psx/gpu.cpp
-@@ -1068,7 +1068,9 @@ pscpu_timestamp_t PS_GPU::Update(const pscpu_timestamp_t sys_timestamp)
-      PSX_RequestMLExit();
-     }
- 
-+#ifdef WANT_DEBUGGER
-     DBG_GPUScanlineHook(scanline);
-+#endif
- 
-     // printf("[GPU] DTA scanline=%3d --- %8d\n", scanline, DrawTimeAvail);
- 
diff --git a/games-emulation/mednafen/files/mednafen-0.9.19-zlib-1.2.6.patch b/games-emulation/mednafen/files/mednafen-0.9.19-zlib-1.2.6.patch
deleted file mode 100644
index 7985a19..0000000
--- a/games-emulation/mednafen/files/mednafen-0.9.19-zlib-1.2.6.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/src/file.cpp b/src/file.cpp
-index 57f4e13..ec1181c 100644
---- a/src/file.cpp
-+++ b/src/file.cpp
-@@ -293,7 +293,7 @@ bool MDFNFILE::MakeMemWrapAndClose(void *tz, int type)
-    goto doret;
-   }
- 
--  while((howmany = gzread(tz, f_data + cur_size, cur_alloced - cur_size)) > 0)
-+  while((howmany = gzread((gzFile)tz, f_data + cur_size, cur_alloced - cur_size)) > 0)
-   {
-    cur_size += howmany;
-    cur_alloced <<= 1;
-@@ -320,7 +320,7 @@ bool MDFNFILE::MakeMemWrapAndClose(void *tz, int type)
-   {
-    int gzerrnum = 0;
-    const char *gzerrstring;
--   if((gzerrstring = gzerror(tz, &gzerrnum)) && gzerrnum != Z_OK && gzerrnum != Z_STREAM_END)
-+   if((gzerrstring = gzerror((gzFile)tz, &gzerrnum)) && gzerrnum != Z_OK && gzerrnum != Z_STREAM_END)
-    {
-     if(gzerrnum != Z_ERRNO)
-     {
-@@ -365,7 +365,7 @@ bool MDFNFILE::MakeMemWrapAndClose(void *tz, int type)
-  }
-  else if(type == MDFN_FILETYPE_GZIP)
-  {
--  gzclose(tz);
-+  gzclose((gzFile)tz);
-  }
-  else if(type == MDFN_FILETYPE_ZIP)
-  {
diff --git a/games-emulation/mednafen/mednafen-0.9.19-r1.ebuild b/games-emulation/mednafen/mednafen-0.9.21.ebuild
similarity index 91%
rename from games-emulation/mednafen/mednafen-0.9.19-r1.ebuild
rename to games-emulation/mednafen/mednafen-0.9.21.ebuild
index fbf6340..92cc230 100644
--- a/games-emulation/mednafen/mednafen-0.9.19-r1.ebuild
+++ b/games-emulation/mednafen/mednafen-0.9.21.ebuild
@@ -7,7 +7,7 @@ inherit autotools eutils flag-o-matic games
 
 DESCRIPTION="An advanced NES, GB/GBC/GBA, TurboGrafx 16/CD, NGPC and Lynx emulator"
 HOMEPAGE="http://mednafen.sourceforge.net/"
-SRC_URI="http://forum.fobby.net/index.php?t=getfile&id=345 -> ${P}.tar.bz2"
+SRC_URI="http://forum.fobby.net/index.php?t=getfile&id=358 -> ${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -36,9 +36,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-psx-debug.patch" \
-		"${FILESDIR}/${P}-zlib-1.2.6.patch"
-
 	sed -i \
 		-e 's:$(datadir)/locale:/usr/share/locale:' \
 		-e 's:$(localedir):/usr/share/locale:' \