diff --git a/pkgs/by-name/x1/x11basic/package.nix b/pkgs/by-name/x1/x11basic/package.nix
new file mode 100644
index 000000000000..a0756b46a437
--- /dev/null
+++ b/pkgs/by-name/x1/x11basic/package.nix
@@ -0,0 +1,68 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitea,
+  autoreconfHook,
+  fig2dev,
+  readline,
+  libX11,
+  bluez,
+  SDL2,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "x11basic";
+  version = "1.28-65";
+
+  src = fetchFromGitea {
+    domain = "codeberg.org";
+    owner = "kollo";
+    repo = "X11Basic";
+    tag = finalAttrs.version;
+    hash = "sha256-07sRUFKJ4CYMtQhRu18PElvNQN2DyKkRJUt7oIhenkA=";
+  };
+
+  sourceRoot = "${finalAttrs.src.name}/src";
+
+  postPatch = ''
+    chmod -R u+w examples/compiler
+    substituteInPlace configure.in \
+      --replace-fail "main(foo)" "int main(int foo)"
+  '';
+
+  nativeBuildInputs = [
+    autoreconfHook
+    fig2dev
+  ];
+
+  buildInputs = [
+    readline
+    libX11
+    SDL2
+    bluez
+  ];
+
+  configureFlags = [
+    "--with-bluetooth"
+    "--with-usb"
+    "--with-readline"
+    "--with-sdl"
+    "--with-x"
+    "--enable-cryptography"
+  ];
+
+  preInstall = ''
+    touch x11basic.{eps,svg}
+    mkdir -p $out/{bin,lib}
+    mkdir -p $out/share/{applications,icons/hicolor/scalable/apps}
+    cp -r ../examples $out/share/.
+  '';
+
+  meta = {
+    homepage = "https://x11-basic.codeberg.page";
+    description = "Basic interpreter and compiler with graphics capabilities";
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ edwtjo ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/development/compilers/x11basic/default.nix b/pkgs/development/compilers/x11basic/default.nix
deleted file mode 100644
index e90eb300ffdc..000000000000
--- a/pkgs/development/compilers/x11basic/default.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  automake,
-  autoconf,
-  readline,
-  libX11,
-  bluez,
-  SDL2,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "X11basic";
-  version = "1.27";
-
-  src = fetchFromGitHub {
-    owner = "kollokollo";
-    repo = pname;
-    rev = version;
-    sha256 = "1hpxzdqnjl1fiwgs2vrjg4kxm29c7pqwk3g1m4p5pm4x33a3d1q2";
-  };
-
-  nativeBuildInputs = [
-    autoconf
-    automake
-  ];
-  buildInputs = [
-    readline
-    libX11
-    SDL2
-    bluez
-  ];
-
-  preConfigure = "cd src;autoconf";
-
-  configureFlags = [
-    "--with-bluetooth"
-    "--with-usb"
-    "--with-readline"
-    "--with-sdl"
-    "--with-x"
-    "--enable-cryptography"
-  ];
-
-  preInstall = ''
-    touch x11basic.{eps,svg}
-    mkdir -p $out/{bin,lib}
-    mkdir -p $out/share/{applications,icons/hicolor/scalable/apps}
-    cp -r ../examples $out/share/.
-  '';
-
-  meta = with lib; {
-    homepage = "https://x11-basic.sourceforge.net/";
-    description = "Basic interpreter and compiler with graphics capabilities";
-    license = licenses.gpl2;
-    maintainers = with maintainers; [ edwtjo ];
-    platforms = platforms.unix;
-  };
-
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c5be1fa2d7cb..71f5affd6a80 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13435,10 +13435,6 @@ with pkgs;
 
   wsjtx = qt5.callPackage ../applications/radio/wsjtx { };
 
-  x11basic = callPackage ../development/compilers/x11basic {
-    autoconf = buildPackages.autoconf269;
-  };
-
   x2goclient = callPackage ../applications/networking/remote/x2goclient { };
 
   x2gokdriveclient = libsForQt5.callPackage ../applications/networking/remote/x2gokdriveclient { };