diff --git a/pgpainless-core/src/main/java/org/pgpainless/key/generation/type/elgamal/ElGamal.java b/pgpainless-core/src/main/java/org/pgpainless/key/generation/type/elgamal/ElGamal.java
deleted file mode 100644
index 23c33d3d..00000000
--- a/pgpainless-core/src/main/java/org/pgpainless/key/generation/type/elgamal/ElGamal.java
+++ /dev/null
@@ -1,52 +0,0 @@
-// SPDX-FileCopyrightText: 2018 Paul Schaub <vanitasvitae@fsfe.org>
-//
-// SPDX-License-Identifier: Apache-2.0
-
-package org.pgpainless.key.generation.type.elgamal;
-
-import java.security.spec.AlgorithmParameterSpec;
-import javax.annotation.Nonnull;
-
-import org.bouncycastle.jce.spec.ElGamalParameterSpec;
-import org.pgpainless.algorithm.PublicKeyAlgorithm;
-import org.pgpainless.key.generation.type.KeyType;
-
-/**
- * ElGamal encryption only key type.
- *
- * @deprecated the use of ElGamal is not recommended anymore.
- */
-@Deprecated
-public final class ElGamal implements KeyType {
-
-    private final ElGamalLength length;
-
-    private ElGamal(@Nonnull ElGamalLength length) {
-        this.length = length;
-    }
-
-    public static ElGamal withLength(ElGamalLength length) {
-        return new ElGamal(length);
-    }
-
-    @Override
-    public String getName() {
-        return "ElGamal";
-    }
-
-    @Override
-    public PublicKeyAlgorithm getAlgorithm() {
-        return PublicKeyAlgorithm.ELGAMAL_ENCRYPT;
-    }
-
-    @Override
-    public int getBitStrength() {
-        return length.getLength();
-    }
-
-    @Override
-    public AlgorithmParameterSpec getAlgorithmSpec() {
-        return new ElGamalParameterSpec(length.getP(), length.getG());
-    }
-
-}
diff --git a/pgpainless-core/src/main/java/org/pgpainless/key/generation/type/elgamal/package-info.java b/pgpainless-core/src/main/java/org/pgpainless/key/generation/type/elgamal/package-info.java
deleted file mode 100644
index 19bc0214..00000000
--- a/pgpainless-core/src/main/java/org/pgpainless/key/generation/type/elgamal/package-info.java
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-FileCopyrightText: 2020 Paul Schaub <vanitasvitae@fsfe.org>
-//
-// SPDX-License-Identifier: Apache-2.0
-
-/**
- * Classes related to ElGamal.
- */
-package org.pgpainless.key.generation.type.elgamal;
diff --git a/pgpainless-core/src/main/kotlin/org/pgpainless/key/generation/type/elgamal/ElGamal.kt b/pgpainless-core/src/main/kotlin/org/pgpainless/key/generation/type/elgamal/ElGamal.kt
new file mode 100644
index 00000000..6cfbc8a7
--- /dev/null
+++ b/pgpainless-core/src/main/kotlin/org/pgpainless/key/generation/type/elgamal/ElGamal.kt
@@ -0,0 +1,28 @@
+// SPDX-FileCopyrightText: 2023 Paul Schaub <vanitasvitae@fsfe.org>
+//
+// SPDX-License-Identifier: Apache-2.0
+
+package org.pgpainless.key.generation.type.elgamal
+
+import org.bouncycastle.jce.spec.ElGamalParameterSpec
+import org.pgpainless.algorithm.PublicKeyAlgorithm
+import org.pgpainless.key.generation.type.KeyType
+
+/**
+ * ElGamal encryption only key type.
+ *
+ * @deprecated the use of ElGamal is not recommended anymore.
+ */
+@Deprecated("The use of ElGamal is not recommended anymore.")
+class ElGamal private constructor(length: ElGamalLength) : KeyType {
+
+    override val name = "ElGamal"
+    override val algorithm = PublicKeyAlgorithm.ELGAMAL_ENCRYPT
+    override val bitStrength = length.length
+    override val algorithmSpec = ElGamalParameterSpec(length.p, length.g)
+
+    companion object {
+        @JvmStatic
+        fun withLength(length: ElGamalLength) = ElGamal(length)
+    }
+}
\ No newline at end of file