--- a/content/media/plugins/MediaPluginHost.cpp
+++ b/content/media/plugins/MediaPluginHost.cpp
@@ -170,16 +170,22 @@ static const char* GetOmxLibraryName()
   else if (version == 13 || version == 12 || version == 11) {
     return "lib/libomxpluginhc.so";
   }
   else if (version == 10 && release_version >= NS_LITERAL_STRING("2.3.6")) {
     // Gingerbread versions from 2.3.6 and above have a different DataSource
     // layout to those on 2.3.5 and below.
     return "lib/libomxplugingb.so";
   }
+  else if (version == 10 && release_version >= NS_LITERAL_STRING("2.3.4") &&
+           device.Find("HTC") == 0) {
+    // HTC devices running Gingerbread 2.3.4+ (HTC Desire HD, HTC Evo Design, etc) seem to
+    // use a newer version of Gingerbread libstagefright than other 2.3.4 devices.
+    return "lib/libomxplugingb.so";
+  }
   else if (version == 9 || (version == 10 && release_version <= NS_LITERAL_STRING("2.3.5"))) {
     // Gingerbread versions from 2.3.5 and below have a different DataSource
     // than 2.3.6 and above.
     return "lib/libomxplugingb235.so";
   }
   else if (version < 9) {
     // Froyo and below are not supported
     return nullptr;