diff --git a/modules/xborders/xborders.nix b/modules/xborders/xborders.nix
index c98de46..49711c8 100644
--- a/modules/xborders/xborders.nix
+++ b/modules/xborders/xborders.nix
@@ -3,32 +3,18 @@
 with pkgs; callPackage python3Packages.buildPythonPackage rec {
   pname = "xborders";
   version = "3.4"; # in version.txt
-
   src = fetchFromGitHub {
-    owner = "ElnuDev";
+    owner = "deter0";
     repo = "xborder";
-    rev = "6a096b4df29e19fee45879c678c33c1a9ada2234";
-    sha256 = "sha256-y+Cip5fcDqnJr0aI3jqJMTt6iCV0faunM+Gk6HFZ5iA=";
+    rev = "d840ed649e92b7ad399cdb1a30aeca7d09f2c08f";
+    sha256 = "sha256-Q2WWXekUL/OOr/OBqJOZbAHaWURbP+coBVp206uPSNY=";
   };
-
-  buildInputs = [
-    libwnck
-    gtk3
-    libnotify
-  ];
-
-  nativeBuildInputs = [
-    wrapGAppsHook
-    gobject-introspection
-  ];
-
-  propagatedBuildInputs = with python3Packages; [
-    pycairo
-    requests
-    pygobject3
-  ];
-
+  buildInputs = [ libwnck gtk3 libnotify ];
+  nativeBuildInputs = [ wrapGAppsHook gobject-introspection ];
+  propagatedBuildInputs = with python3Packages; [ pycairo requests pygobject3 ];
   preBuild = ''
+    sed '52,58!d' ${pname}
+    sed -i '51 a\    return ${version}' ${pname}
     cat >setup.py <<'EOF'
     from setuptools import setup
     setup(
@@ -38,12 +24,11 @@ with pkgs; callPackage python3Packages.buildPythonPackage rec {
       description='${meta.description}',
       install_requires=['pycairo', 'requests', 'PyGObject'],
       scripts=[
-        'xborders',
+        '${pname}',
       ],
     )
     EOF
   '';
-
   meta = with lib; {
     description = "Active window border replacement for window managers.";
     homepage = "https://github.com/deter0/xborder";