diff --git a/pkgs/by-name/ea/eaglemode/package.nix b/pkgs/by-name/ea/eaglemode/package.nix
index 47de71c1090b..c9b48d69b5a3 100644
--- a/pkgs/by-name/ea/eaglemode/package.nix
+++ b/pkgs/by-name/ea/eaglemode/package.nix
@@ -12,7 +12,7 @@
   pkg-config,
   librsvg,
   glib,
-  gtk2,
+  gtk3,
   libXext,
   libXxf86vm,
   poppler,
@@ -32,18 +32,22 @@
   extraRuntimeDeps ? [ ],
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "eaglemode";
-  version = "0.96.2";
+  version = "0.96.3";
 
   src = fetchurl {
-    url = "mirror://sourceforge/eaglemode/${pname}-${version}.tar.bz2";
-    hash = "sha256:1al5n2mcjp0hmsvi4hsdmzd7i0id5i3255xplk0il1nmzydh312a";
+    url = "mirror://sourceforge/eaglemode/eaglemode-${finalAttrs.version}.tar.bz2";
+    hash = "sha256-AHeupgEnyQylRWFDrPeo4b0mNONqG+6QwWnRpYknqOQ=";
   };
 
   # Fixes "Error: No time zones found." on the clock
   postPatch = ''
-    substituteInPlace src/emClock/emTimeZonesModel.cpp --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
+    substituteInPlace src/emClock/emTimeZonesModel.cpp \
+      --replace-fail "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
+
+    substituteInPlace makers/emPdf.maker.pm \
+      --replace-fail gtk+-2.0 gtk+-3.0
   '';
 
   nativeBuildInputs = [
@@ -61,7 +65,7 @@ stdenv.mkDerivation rec {
     libwebp
     librsvg
     glib
-    gtk2
+    gtk3
     libXxf86vm
     libXext
     poppler
@@ -109,18 +113,18 @@ stdenv.mkDerivation rec {
       wrapProgram $out/bin/eaglemode --set EM_DIR "$out" --prefix LD_LIBRARY_PATH : "$out/lib" --prefix PATH : "${runtimeDeps}"
       for i in 32 48 96; do
         mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps
-        ln -s $out/res/icons/${pname}$i.png $out/share/icons/hicolor/''${i}x''${i}/apps/${pname}.png
+        ln -s $out/res/icons/eaglemode$i.png $out/share/icons/hicolor/''${i}x''${i}/apps/eaglemode.png
       done
       runHook postInstall
     '';
 
   desktopItems = [
     (makeDesktopItem {
-      name = pname;
-      exec = pname;
-      icon = pname;
+      name = "eaglemode";
+      exec = "eaglemode";
+      icon = "eaglemode";
       desktopName = "Eagle Mode";
-      genericName = meta.description;
+      genericName = "Zoomable User Interface";
       categories = [
         "Game"
         "Graphics"
@@ -132,7 +136,7 @@ stdenv.mkDerivation rec {
 
   passthru.updateScript = directoryListingUpdater {
     url = "https://eaglemode.sourceforge.net/download.html";
-    extraRegex = "(?!.*(x86_64|setup64|livecd)).*";
+    extraRegex = "(?!.*(x86_64|setup64|livecd|amd64)).*";
   };
 
   meta = {
@@ -145,4 +149,4 @@ stdenv.mkDerivation rec {
     ];
     platforms = lib.platforms.linux;
   };
-}
+})